WebSVN – DevTools – Diff – /core_devl/trunk/TOOLS/makelib.pl2



our @LINTLIBS               = ();
our @LINTSHLIBS             = ();
 
our @TESTS_TO_RUN           = ();                           # Info from 'RunTest' directives
 
our @TESTPROJECT_TO_URUN    = ();                           # List of Unit Tests and Projects names (Auto and Non Auto in order defined in makefile)
our @TESTPROJECT_TO_ARUN    = ();                           # List of Auto Tests and Projects names in order defined in makefile
my  $TESTS_TO_AUTORUN       = undef;                        # Flag - Auto Test found
my  $TESTS_TO_RUN           = undef;                        # Flag - Unit Test found
 
#our $CurrentTime           = "";
#our $CurrentDate           = "";

PKGDIR		= \$(GBE_ROOT)/$PKGDIR
INCDIR_PKG	= \$(PKGDIR)/include
LIBDIR_PKG	= \$(PKGDIR)/lib
BINDIR_PKG	= \$(PKGDIR)/bin
CLSDIR_PKG	= \$(PKGDIR)/classes
UTFDIR_PKG	= \$(GBE_ROOT_ABS)/$PKGDIR/utfResults
 
LOCALDIR	= \$(GBE_ROOT)/local
INCDIR_LOCAL	= \$(LOCALDIR)/inc
LIBDIR_LOCAL	= \$(LOCALDIR)/lib
BINDIR_LOCAL	= \$(LOCALDIR)/bin

 
        my $tdir_alias = $pEntry->{'testdir'};
        my $tdir = '$(' . $tdir_alias . ')';
 
        my $test_name = $pEntry->{'test_name'};
        push @TESTPROJECT_TO_URUN, $test_name;
        push @TESTPROJECT_TO_ARUN, $test_name if     ($pEntry->{'auto'} );
 
        my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );
        
        my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );
 
        #
        #   Export GBE_UTF... for the duration of the test
        #
        $me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});
        $me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});
        $me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');
 
        $me->AddDependancy( "\$(GBE_$tdir_alias)" );
        $me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );
        $me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};
        $me->AddDependancy( @{ $pEntry->{'copyin' } } );

        $me->AddDependancy( @{ $pEntry->{'preq'} } );
        $me->RecipePrefix ('$(XX_PRE)');
        $me->RecipeComment( "------ Running test [$idx] ..." );
 
        #
        #   Create package utfResults directory
        #       Simplify use of the file
        #
        $me->AddShellRecipe ( 'mkdir -p $(UTFDIR_PKG)' );
 
        #
        #   Extend the PATH seen by the script to include the local/bin directory
        #   Allows programs and tests that have been created elsewhere in the component
        #   to be accessed within the script.
        #
        $me->AddShellRecipe ( ". \$(INTERFACEDIR)/set_$::ScmPlatform.sh" );

            
            #
            #   Insert commands to post process the test results according to the specified formatter
            #
            $me->NewSection     ();
            $me->SectionIfDef   ('UTF_POSTPROCESS');
            $me->RecipePrefix   ('$(XX_PRE)');
            $me->AddRecipe      ( "\$(GBE_PERL) -Mjats_runutf -e processUtf " . join(" \\\n\t\t\t", @cmdline)  );
        }
 
        $me->Print();

 
my @autoruntestdep;
push @autoruntestdep, 'makefile.pl', '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN );
 
my @runtestdep;
 
 
push @runtestdep    , 'makefile.pl', '$(UNITTESTS)' if ( @TESTPROJECT_TO_URUN );
 
#
#   Dependencies for 'exec_tests' and friends
#
my @untestprogact;

    Maketag( "make_mlib",           @mlibdep );
    Maketag( "make_install_shlib",  %INSTALL_SHLIBS || @shlibdep);
    Maketag( "make_script",         @scriptdep );
    Maketag( "make_prog",           @progdep || @projectdep );
    Maketag( "make_test",           @testprogdep );
    Maketag( "exec_tests",          $TESTS_TO_RUN     || @TESTPROJECT_TO_URUN );
    Maketag( "exec_unit_tests",     $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN );
    Maketag( "process_tests",       @TOOLSET_UTF_PRE || @TOOLSET_UTF_POST || @TOOLSET_UTF_COLLATE);
    Maketag( "install_hdr",         %INSTALL_HDRS );
    Maketag( "install_class",       %INSTALL_CLSS );
    Maketag( "install_lib",         %INSTALL_LIBS );

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 4928 → 4996

Rev 4928		Rev 4996
Line 260...		Line 260...
260	`our @LINTLIBS = ();`	260	`our @LINTLIBS = ();`
261	`our @LINTSHLIBS = ();`	261	`our @LINTSHLIBS = ();`
262		262
263	`our @TESTS_TO_RUN = (); # Info from 'RunTest' directives`	263	`our @TESTS_TO_RUN = (); # Info from 'RunTest' directives`
264		264
265	`our @TESTPROJECT_TO_URUN = (); # List of Unit Tests and Projects names (Non Auto)`	265	`our @TESTPROJECT_TO_URUN = (); # List of Unit Tests and Projects names (Auto and Non Auto in order defined in makefile)`
266	`our @TESTPROJECT_TO_ARUN = (); # List of Auto Tests and Projects names`	266	`our @TESTPROJECT_TO_ARUN = (); # List of Auto Tests and Projects names in order defined in makefile`
267	`my $TESTS_TO_AUTORUN = undef; # Flag - Auto Test found`	267	`my $TESTS_TO_AUTORUN = undef; # Flag - Auto Test found`
268	`my $TESTS_TO_RUN = undef; # Flag - Unit Test found`	268	`my $TESTS_TO_RUN = undef; # Flag - Unit Test found`
269		269
270	`#our $CurrentTime = "";`	270	`#our $CurrentTime = "";`
271	`#our $CurrentDate = "";`	271	`#our $CurrentDate = "";`
Line 8669...		Line 8669...
8669	`PKGDIR = \$(GBE_ROOT)/$PKGDIR`	8669	`PKGDIR = \$(GBE_ROOT)/$PKGDIR`
8670	`INCDIR_PKG = \$(PKGDIR)/include`	8670	`INCDIR_PKG = \$(PKGDIR)/include`
8671	`LIBDIR_PKG = \$(PKGDIR)/lib`	8671	`LIBDIR_PKG = \$(PKGDIR)/lib`
8672	`BINDIR_PKG = \$(PKGDIR)/bin`	8672	`BINDIR_PKG = \$(PKGDIR)/bin`
8673	`CLSDIR_PKG = \$(PKGDIR)/classes`	8673	`CLSDIR_PKG = \$(PKGDIR)/classes`
-		8674	`UTFDIR_PKG = \$(GBE_ROOT_ABS)/$PKGDIR/utfResults`
8674		8675
8675	`LOCALDIR = \$(GBE_ROOT)/local`	8676	`LOCALDIR = \$(GBE_ROOT)/local`
8676	`INCDIR_LOCAL = \$(LOCALDIR)/inc`	8677	`INCDIR_LOCAL = \$(LOCALDIR)/inc`
8677	`LIBDIR_LOCAL = \$(LOCALDIR)/lib`	8678	`LIBDIR_LOCAL = \$(LOCALDIR)/lib`
8678	`BINDIR_LOCAL = \$(LOCALDIR)/bin`	8679	`BINDIR_LOCAL = \$(LOCALDIR)/bin`
Line 9349...		Line 9350...
9349		9350
9350	`my $tdir_alias = $pEntry->{'testdir'};`	9351	`my $tdir_alias = $pEntry->{'testdir'};`
9351	`my $tdir = '$(' . $tdir_alias . ')';`	9352	`my $tdir = '$(' . $tdir_alias . ')';`
9352		9353
9353	`my $test_name = $pEntry->{'test_name'};`	9354	`my $test_name = $pEntry->{'test_name'};`
9354	`push @TESTPROJECT_TO_URUN, $test_name unless ($pEntry->{'auto'} );`	9355	`push @TESTPROJECT_TO_URUN, $test_name;`
9355	`push @TESTPROJECT_TO_ARUN, $test_name if ($pEntry->{'auto'} );`	9356	`push @TESTPROJECT_TO_ARUN, $test_name if ($pEntry->{'auto'} );`
9356		9357
9357	`my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );`	9358	`my $tprog = $tdir . '/' . StripDir( $pEntry->{'prog'} );`
9358		9359
9359	`my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );`	9360	`my $me = MakeEntry::New( *MAKEFILE, $test_name, '--Phony' );`
9360		9361
9361	`#`	9362	`#`
9362	`# Export GBE_UTFNAME for the duration of the test`	9363	`# Export GBE_UTF... for the duration of the test`
9363	`#`	9364	`#`
9364	`$me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});`	9365	`$me->AddDefn('export GBE_UTFNAME', $pEntry->{'utfname'});`
9365	`$me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});`	9366	`$me->AddDefn('export GBE_UTFUID', '$(MAKEFILEUID)' . '_' . $pEntry->{'index'});`
-		9367	`$me->AddDefn('export GBE_UTFFILE','$(UTFDIR_PKG)/$(GBE_PLATFORM)-$(GBE_TYPE)-$(GBE_UTFUID)' . '.xml');`
9366		9368
9367	`$me->AddDependancy( "\$(GBE_$tdir_alias)" );`	9369	`$me->AddDependancy( "\$(GBE_$tdir_alias)" );`
9368	`$me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );`	9370	`$me->AddDependancy( "\$(INTERFACEDIR)/set_$::ScmPlatform.sh" );`
9369	`$me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};`	9371	`$me->AddDependancy( $tprog ) if $pEntry->{'copyprog'};`
9370	`$me->AddDependancy( @{ $pEntry->{'copyin' } } );`	9372	`$me->AddDependancy( @{ $pEntry->{'copyin' } } );`
Line 9372...		Line 9374...
9372	`$me->AddDependancy( @{ $pEntry->{'preq'} } );`	9374	`$me->AddDependancy( @{ $pEntry->{'preq'} } );`
9373	`$me->RecipePrefix ('$(XX_PRE)');`	9375	`$me->RecipePrefix ('$(XX_PRE)');`
9374	`$me->RecipeComment( "------ Running test [$idx] ..." );`	9376	`$me->RecipeComment( "------ Running test [$idx] ..." );`
9375		9377
9376	`#`	9378	`#`
-		9379	`# Create package utfResults directory`
-		9380	`# Simplify use of the file`
-		9381	`#`
-		9382	`$me->AddShellRecipe ( 'mkdir -p $(UTFDIR_PKG)' );`
-		9383
-		9384	`#`
9377	`# Extend the PATH seen by the script to include the local/bin directory`	9385	`# Extend the PATH seen by the script to include the local/bin directory`
9378	`# Allows programs and tests that have been created elsewhere in the component`	9386	`# Allows programs and tests that have been created elsewhere in the component`
9379	`# to be accessed within the script.`	9387	`# to be accessed within the script.`
9380	`#`	9388	`#`
9381	`$me->AddShellRecipe ( ". \$(INTERFACEDIR)/set_$::ScmPlatform.sh" );`	9389	`$me->AddShellRecipe ( ". \$(INTERFACEDIR)/set_$::ScmPlatform.sh" );`
Line 9432...		Line 9440...
9432		9440
9433	`#`	9441	`#`
9434	`# Insert commands to post process the test results according to the specified formatter`	9442	`# Insert commands to post process the test results according to the specified formatter`
9435	`#`	9443	`#`
9436	`$me->NewSection ();`	9444	`$me->NewSection ();`
9437	`$me->SectionDef ('UTF_POSTPROCESS');`	9445	`$me->SectionIfDef ('UTF_POSTPROCESS');`
9438	`$me->RecipePrefix ('$(XX_PRE)');`	9446	`$me->RecipePrefix ('$(XX_PRE)');`
9439	`$me->AddRecipe ( "\$(GBE_PERL) -Mjats_runutf -e processUtf " . join(" \\\n\t\t\t", @cmdline) );`	9447	`$me->AddRecipe ( "\$(GBE_PERL) -Mjats_runutf -e processUtf " . join(" \\\n\t\t\t", @cmdline) );`
9440	`}`	9448	`}`
9441		9449
9442	`$me->Print();`	9450	`$me->Print();`
Line 9929...		Line 9937...
9929		9937
9930	`my @autoruntestdep;`	9938	`my @autoruntestdep;`
9931	`push @autoruntestdep, 'makefile.pl', '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN );`	9939	`push @autoruntestdep, 'makefile.pl', '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN );`
9932		9940
9933	`my @runtestdep;`	9941	`my @runtestdep;`
9934	`push @runtestdep, 'makefile.pl' if ( @TESTPROJECT_TO_URUN \|\| @TESTPROJECT_TO_ARUN);`	-
9935	`push @runtestdep, '$(UNITTESTS)' if ( @TESTPROJECT_TO_URUN);`	-
9936	`push @runtestdep, '$(AUTOUNITTESTS)' if ( @TESTPROJECT_TO_ARUN);`	9942	`push @runtestdep , 'makefile.pl', '$(UNITTESTS)' if ( @TESTPROJECT_TO_URUN );`
9937		9943
9938	`#`	9944	`#`
9939	`# Dependencies for 'exec_tests' and friends`	9945	`# Dependencies for 'exec_tests' and friends`
9940	`#`	9946	`#`
9941	`my @untestprogact;`	9947	`my @untestprogact;`
Line 10153...		Line 10159...
10153	`Maketag( "make_mlib", @mlibdep );`	10159	`Maketag( "make_mlib", @mlibdep );`
10154	`Maketag( "make_install_shlib", %INSTALL_SHLIBS \|\| @shlibdep);`	10160	`Maketag( "make_install_shlib", %INSTALL_SHLIBS \|\| @shlibdep);`
10155	`Maketag( "make_script", @scriptdep );`	10161	`Maketag( "make_script", @scriptdep );`
10156	`Maketag( "make_prog", @progdep \|\| @projectdep );`	10162	`Maketag( "make_prog", @progdep \|\| @projectdep );`
10157	`Maketag( "make_test", @testprogdep );`	10163	`Maketag( "make_test", @testprogdep );`
10158	`Maketag( "exec_tests", $TESTS_TO_RUN \|\| @TESTPROJECT_TO_URUN \|\| $TESTS_TO_AUTORUN \|\| @TESTPROJECT_TO_ARUN );`	10164	`Maketag( "exec_tests", $TESTS_TO_RUN \|\| @TESTPROJECT_TO_URUN );`
10159	`Maketag( "exec_unit_tests", $TESTS_TO_AUTORUN \|\| @TESTPROJECT_TO_ARUN );`	10165	`Maketag( "exec_unit_tests", $TESTS_TO_AUTORUN \|\| @TESTPROJECT_TO_ARUN );`
10160	`Maketag( "process_tests", @TOOLSET_UTF_PRE \|\| @TOOLSET_UTF_POST \|\| @TOOLSET_UTF_COLLATE);`	10166	`Maketag( "process_tests", @TOOLSET_UTF_PRE \|\| @TOOLSET_UTF_POST \|\| @TOOLSET_UTF_COLLATE);`
10161	`Maketag( "install_hdr", %INSTALL_HDRS );`	10167	`Maketag( "install_hdr", %INSTALL_HDRS );`
10162	`Maketag( "install_class", %INSTALL_CLSS );`	10168	`Maketag( "install_class", %INSTALL_CLSS );`
10163	`Maketag( "install_lib", %INSTALL_LIBS );`	10169	`Maketag( "install_lib", %INSTALL_LIBS );`