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

 our @TESTS_TO_RUN           = ();
 our @TESTPROJECT_TO_URUN    = ();
 our @TESTPROJECT_TO_ARUN    = ();
 my  $TESTS_TO_AUTORUN       = undef;
+my  $TESTS_TO_RUN           = undef;
 #our $CurrentTime           = "";
 #our $CurrentDate           = "";
 #our $Cwd                   = "";
 #                               The script may be generated and need not exist
 #                               at the time the makefile is created.
 #                       --Shell
 #                               The command line argument is a shell script that
 #                               will be passed to a simple shell.
+#                       --Prog=name
+#                               Resolve to a program generated within this makefile
+#
+#
 #                   The command line argument contains keywords to allow
 #                   information to be extracted from the line. Keywords are:
+#
 #                                                 tools is to be run.
 #                                                 Must be before any options that declare
 #                                                 creation of files.
 #                       --Text=<text>           - Display text for command
+#
 #                       --Clean[=arg]           - Call script with arg[-clean] for cleaning.
+#                       --PreDelete             - Delete generated files before running the command
+#
 #               Eg: GenerateFiles ( '*', "--Tool=mod_if.pl",
 #                                        "-src --Prerequisite(udh_module.cfg)",
 #                                        "-direct -hdr --Generated(udp.h) -quiet" );
+#
     my $clean_tag;
     my $text;
     my $gtype = 1;
     my @var_opts;
     my @genreq_seen;
+    my $predelete;
+    #
     #   Process the first argument - this describes the program that will be used
     #   to generate the files. It may be:
     #       --Tool          - A Jats Tool or Plugin
     #   These will be command line arguments or options/flags
     #   Command line arguments are concatenated together
+    #
     for my $arg (@args)
+    {
+        if ( $arg =~ /^--PreDelete$/ )
+        {
+            #
+            #   Delete generated files before running the generation process
+            #   Some programs refuse to overwrite existing files
+            #
+            $predelete = 1;
+            next;
+        }
         if ( $arg =~ /^--NoVarTag$/ )
+        {
+            #
             #   Modify the operation of --Var to supress the tags
             #   Should be usd early as will only affect following --Var usage
     $gen_data{'tool'}       = $tool;
     $gen_data{'toolargs'}   = \@tool_args;
     $gen_data{'clean'}      = $clean_tag;
     $gen_data{'text'}       = $text || $gen_files[0];
     $gen_data{'preq_sus'}   = 1 if ( $preq_unknown );
+    $gen_data{'predelete'}  = 1 if ( $predelete );
     push(@GENERATE_FILES, \%gen_data);
     Debug2( "GenerateFiles: cmd: $tool @tool_args" );
+}
     $PROJECTS{$proj}{'unittest'} = $unit_tests if ( $unit_tests );
     $PROJECTS{$proj}{'autotest'} = $auto_tests if ( $auto_tests );
     UniquePush (\@PROJECTS_ORDER, $proj);
     $TESTS_TO_AUTORUN = 1 if ( $auto_tests );
+    $TESTS_TO_RUN = 1 if ( $unit_tests || $auto_tests );
+    #
     #   Validate some of the arguments
+    #
     Error ("MakeAnt. Conflicting options --Debug and --Prod" )
         my %package_entry;
+        #
         #   Special cases: Provide make-style $ escape processing.
         #       Allow files with a $ in the name
         #       Allow files with a space in the name
+        #   Only for file names that don't look like $(GBE_...) as these
+        #   may be generated internally
+        #
+        unless ( m~\$\(GBE_.+\)~ )
+        {
-        s~\$~\$\$~g;
+            s~\$~\$\$~g;
-        s~ ~\\ ~g;
+            s~ ~\\ ~g;
+        }
         if ( ! /^--(.*)/ )
+        {
             $name = $_;
             $basename = StripDir( $name );
     foreach my $i ( @GENERATE_FILES )
+    {
         my $gen_tag = $i->{'index'};
+        #
+        #   If predelete is enabled, then create a list of files to delete
+        #
+        if ( $i->{'predelete'}  )
+        {
+            MakeDefEntry( "generate_gen_$gen_tag", "=",  $i->{'gen'} );
+            MakePrint("\n")
+        }
+        #
         #   Generate the basic generate rule and recipe
         #   together with the prerequisites
+        #
         MakeEntry ( "", ":", "", " ", @{$i->{'gen'}} );
             MakeEntry ( "", "", " \\\n\t\t", "", @{$i->{'preq'}} );
             MakeEntry ( "", "", " \\\n\t\t", "", "phony_generate" ) if $i->{'preq_sus'};
             MakeEntry ( "", "", " \\\n\t\t", "", "\$(SCM_MAKEFILE)" );
             MakePrint ("\n\t" . "\@\$(echo) [$i->{'text'}] generating.." );
+            if ( $i->{'predelete'}  )
+            {
+                MakePrint ("\n\t" . "\$(XX_PRE)\$(call RmFiles,generate_gen_$gen_tag)" );
+            }
             MakePrint ("\n\t" . "\$(XX_PRE)\$(call generate_$gen_tag,)" );
+        }
+        #
         #   Generate 'clean' rules and recipes
     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( "run_tests",           @TESTS_TO_RUN || @TESTPROJECT_TO_URUN);
+    Maketag( "run_tests",           @TESTS_TO_RUN || @TESTPROJECT_TO_URUN || $TESTS_TO_RUN);
     Maketag( "run_unit_tests",      $TESTS_TO_AUTORUN || @TESTPROJECT_TO_ARUN);
     Maketag( "install_hdr",         %INSTALL_HDRS );
     Maketag( "install_class",       %INSTALL_CLSS );
     Maketag( "install_lib",         %INSTALL_LIBS );
     Maketag( "install_prog",        %INSTALL_PROGS );

Subversion Repositories DevTools

(root)/core_devl/trunk/TOOLS/makelib.pl2 – Rev 261 → 263