WebSVN – DevTools – Diff – /core_devl/branches/dpurdie_devl/TOOLS/makelib.pl2

 sub MakePrintList
+{
     print MAKEFILE $_ . "\n" foreach (@{$_[0]});
+}
+sub QuoteArray
+{
+    my $quote = "'";
+    if ( @_ ) {
+        return ($quote . join("$quote $quote", @_) . $quote);
+    }
+    return '';
+}
 #-------------------------------------------------------------------------------
 # Function        : MakeEntry
+#
 # Description     : Build a entry based on the element list
 #   Deletion is done AFTER the toolset functions have been invoked to create the
 #   build artifacts so that the toolsets can create directories too
     MakeHeader ("Subdir creation");
     CreateMkdirRules();
-    MkdirRule( '$(OBJDIR)', 'OBJDIR' );                # Object build directory
+    MkdirRule( '$(OBJDIR)', 'OBJDIR', '--Extra=depend,depend.err' );  # Object build directory
-    MkdirRule( '$(OBJDIR)/'.$_ ) foreach (@SHLIBS);    # Shared library build directory
+    MkdirRule( '$(OBJDIR)/'.$_ ) foreach (@SHLIBS);                     # Shared library build directory
-    MkdirRule( '$(LIBDIR)', 'LIBDIR' );                # Library directory
+    MkdirRule( '$(LIBDIR)', 'LIBDIR' );                                 # Library directory
-    MkdirRule( '$(BINDIR)', 'BINDIR' );                # Binary directory
+    MkdirRule( '$(BINDIR)', 'BINDIR' );                                 # Binary directory
+    #
     #   Create a directory for library merge tool to work within
+    #
     MkdirRule( "\$(MLIBDIR)", 'MLIBDIR', '--Path=$(GBE_PLATFORM).MRG', '--RemoveAll' ) if (@MLIBS);
 EOF
+}
+#
 #   Rule to unmake the depend file
+#       No longer neeed.
+#       The file is deleted as a part of the OBJDIR cleanup
+#
     print MAKEFILE <<EOF;
 undepend:
-	-\$(XX_PRE)\$(rm) -f \$(OBJDIR)/depend
 EOF
 #--------- IFLAG Documentation -------------------------------------------------
+#
 #   IFLAG - iteration flag. This is setting by the calling process
 .PHONY:		make_clean
 make_clean:
 	-\@echo "Removing generated files (objects, libraries, binaries etc)";
-#
-#   Under windows/cygwin, there is a problem with the rm being used
-#   The expansion of wildcards will terminate the command if:
-#       1) No files exist to expand  : Solution : touch a file of that type
-#       2) A directory is involved   : Solution : cd to directory
-#
-#   Cannot use make's wildcard function as this only operates in the current directory
-#
 .PHONY:		rmlitter
 rmlitter:
-	-\$(AA_PRE)( echo "Removing litter";\\
+	-\$(AA_PRE)JatsFileUtil 'D0' 'Removing litter' '.' 'core' '*.bak' '*.tmp' '*.err'
-		\$(touch) _delete.bak _delete.tmp _delete.err ;\\
-		\$(rm) -f core *.bak *.tmp *.err ;\\
-		for subdir in \$(SHDIRS) '' ; do \\
-			if [ -d "\$\$subdir" ] ; then \\
-				( cd \$\$subdir ;\\
-				\$(touch) _delete.err _delete.cmd ;\\
-				\$(rm) -r * ; );\\
-			fi ;\\
-		done;\\
-		for subdir in \$(OBJDIR) '' ; do \\
-			if [ -d "\$\$subdir" ] ; then \\
-				( cd \$\$subdir ;\\
-				\$(touch) _delete.err _delete.cmd ;\\
-				\$(rm) -r *.err *.cmd ; );\\
-			fi ;\\
-		done;\\
-	)
 .PHONY:		lint_init
 lint_init:
 EOF
 #   build artifacts so that the toolsets can create directories too
+#
 #   Note: Toolset directories are deleted first
 #   Note: User Directories are deleted in the reverse order of creation
+#
+#   Add them into the directory data structure
+#
+    foreach my $path ( @TOOLSETDIRS )
+    {
+        MkdirRule( $path, '', '--NoCreate' );
+    }
+    foreach my $path ( @TOOLSETDIRTREES )
+    {
+        MkdirRule( $path, '', '--NoCreate' , '--RemoveAll');
+    }
     MakeHeader ("Subdir deletion");
-    MakePrint( ".PHONY:\t\tunmake_dir\n" );
-    MakePrint( "unmake_dir:\n" );
-    MakePrint( "\t-\$(AA_PRE)echo Removing directories;" );
-    MakePrint( " \\\n\t\$(rmdir) \$(TOOLSETDIRS);" )            if ( @TOOLSETDIRS );
-    MakePrint( " \\\n\t\$(rm) -rf \$(TOOLSETDIRTREES);" )       if ( @TOOLSETDIRTREES );
     RmdirRules();
     MakeNewLine();
 #--------- Toolset Rules -------------------------------------------------------
     MakeHeader ("Toolset Rules");
 #                   Such entries will be retained and dumped at a known time
+#
 # Inputs          : $subdir     - Symbolic name of the subdir $(OBJDIR)
 #                   $alias      - Optional script alias for the dir 'OBJDIR' --> GBE_OBJDIR
 #                   Options:
-#                       --Path=path     Optional value of $subdir '$(GBE_PLATFORM)$(GBE_TYPE).OBJ'
+#                       --Path=path             Optional value of $subdir '$(GBE_PLATFORM)$(GBE_TYPE).OBJ'
-#                       --RemoveAll     Remove all files on clean
+#                       --RemoveAll             Remove all files on clean
+#                       --Extra=file[,file]     Additiona files to remove
+#                       --NoCreate              Do not Create the Directory, just delete it
+#
 # Returns         : Nothing
+#
 sub MkdirRule
+        {
             if ( /^--Path=(.+)/ ) {
                 $data{path} = $1;
             } elsif ( /^--RemoveAll/ ) {
                 $data{remove_all} = 1;
+            } elsif ( /^--NoCreate/ ) {
+                $data{noCreate} = 1;
+            } elsif ( /^--Extra=(.+)/ ) {
+                @{$data{extraFiles}} = split(/,/, $1);
             } else {
                 Error ("MkdirRule: Unknown option: $_");
+            }
+        }
         $data{alias} = $alias if ( $alias );
+    #
     #   Save or print
+    #
     return unless ( $MkdirRulePrinting );
+    return if ( $MkdirRuleData{$subdir}{noCreate} );
+    #
     #   Create a definition of the physical directory
+    #
     my $path = $MkdirRuleData{$subdir}{path};
+}
 #-------------------------------------------------------------------------------
 # Function        : RmdirRules
+#
-# Description     : Create the body of a recipe to delete the directoeis that
+# Description     : Create the body of a recipe to delete the directories that
 #                   have been created.
+#
-#                   The rule header will have been written to the makefile
+#                   Use JatsFileUtil rather than shell script
+#                       Faster under windows (and others)
+#                       Solved long pathname issues
+#                       Simpler to use and control
+#
 # Inputs          : Uses $MkdirRuleData
+#
 # Returns         : Nothing.
 #                   Prints to the makefile
+#
 sub RmdirRules
+{
+    MakePrint( ".PHONY:\tunmake_dir\n" );
+    MakePrint( "unmake_dir:\n" );
+    #
     #   Determine the list of directories to delete
-    #   Sort such that subdirs are deleted files
+    #   Sort such that subdirs are deleted first
+    #
+    my $txt = 'Removing directories';
     foreach my $subdir ( reverse sort keys %MkdirRuleData )
+    {
-        MakePrint "\\\n";                       # join to previous line
+        my @args = $subdir;
-        MakePrint "\tif [ -d $subdir ]; then \\\n";
+        push (@args, $MkdirRuleGbeFile, 'core', '*.bak', '*.tmp', '*.err')
-        unless ( $MkdirRuleData{$subdir}{remove_all} )
+            unless $MkdirRuleData{$subdir}{remove_all};
-        {
-            MakePrint "\t\t\$(rm) -f $subdir/$MkdirRuleGbeFile; \\\n";
+        push (@args, @{$MkdirRuleData{$subdir}{extraFiles}})
-            MakePrint "\t\t\$(rmdir) $subdir; \\\n";
+            if ( $MkdirRuleData{$subdir}{extraFiles} );
-        }
-        else
+        my $mode = $MkdirRuleData{$subdir}{remove_all} ? 'T0' : 'D0';
-        {
-            MakePrint "\t\t\$(rm) -rf $subdir; \\\n";
+        MakePrint ("\t-\$(AA_PRE)JatsFileUtil ", QuoteArray( $mode, $txt, @args ), "\n");
-        }
-        MakePrint "\tfi;";
+        $txt = '';
+    }
+}
 #-------------------------------------------------------------------------------
 # Function        : CreateMkdirRules

Subversion Repositories DevTools

(root)/core_devl/branches/dpurdie_devl/TOOLS/makelib.pl2 – Rev 2074 → 2312