ChangeLogTag: Mon Nov 8 11:34:34 2004 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 34 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index d7c5dbee883..9275341f879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov  8 11:34:34 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/DependencyGenerator/DependencyEditor.pm:
+        * bin/DependencyGenerator/DependencyGenerator.pm:
+
+          Slight performance modifications.
+
+        * bin/generate_export_file.pl:
+
+          Print debug messages to STDERR to allow clean redirection with the
+          use of the -d option.
+
 Mon Nov  8 07:53:46 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/msvc_mpc_auto_compile.pl:
diff --git a/bin/DependencyGenerator/DependencyEditor.pm b/bin/DependencyGenerator/DependencyEditor.pm
index 1e884360d9e..8ee36bdd11b 100644
--- a/bin/DependencyGenerator/DependencyEditor.pm
+++ b/bin/DependencyGenerator/DependencyEditor.pm
@@ -15,7 +15,6 @@ use FileHandle;
 use File::Basename;
 
 use DependencyGenerator;
-use ObjectGeneratorFactory;
 
 # ************************************************************
 # Subroutine Section
@@ -60,15 +59,14 @@ sub process {
       }
     }
 
-    print $fh "# DO NOT DELETE THIS LINE -- " . basename($0) . " uses it.\n" .
+    print $fh "# DO NOT DELETE THIS LINE -- ", basename($0), " uses it.\n",
               "# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.\n\n";
 
     my($dep) = new DependencyGenerator($macros, $ipaths, $replace,
                                        $type, $noinline, $exclude);
-    my($objgen) = ObjectGeneratorFactory::create($type);
     ## Sort the files so the dependencies are reproducible
     foreach my $file (sort @$files) {
-      print $fh $dep->process($file, $objgen->process($file)) . "\n";
+      print $fh $dep->process($file), "\n";
     }
 
     print $fh "# IF YOU PUT ANYTHING HERE IT WILL GO AWAY\n";
diff --git a/bin/DependencyGenerator/DependencyGenerator.pm b/bin/DependencyGenerator/DependencyGenerator.pm
index c28cae59c26..5c1264b6f56 100644
--- a/bin/DependencyGenerator/DependencyGenerator.pm
+++ b/bin/DependencyGenerator/DependencyGenerator.pm
@@ -14,6 +14,7 @@ use strict;
 
 use Preprocessor;
 use DependencyWriterFactory;
+use ObjectGeneratorFactory;
 
 # ************************************************************
 # Subroutine Section
@@ -31,6 +32,7 @@ sub new {
                                                         $ipaths, $exclude),
                          'replace'  => $replace,
                          'dwrite'   => DependencyWriterFactory::create($type),
+                         'objgen'   => ObjectGeneratorFactory::create($type),
                          'noinline' => $noinline,
                         }, $class;
 
@@ -52,17 +54,15 @@ sub new {
 sub process {
   my($self)    = shift;
   my($file)    = shift;
-  my($objects) = shift;
   my($replace) = $self->{'replace'};
-  my($cwd)     = $self->{'cwd'};
 
   ## Generate the dependency string
   my($depstr) = $self->{'dwrite'}->process(
-                   $objects,
+                   $self->{'objgen'}->process($file),
                    $self->{'pre'}->process($file, $self->{'noinline'}));
 
   ## Perform the replacements on the dependency string
-  $depstr =~ s/$cwd//go;
+  $depstr =~ s/$self->{'cwd'}//go;
   foreach my $rep (@{$self->{'repkeys'}}) {
     $depstr =~ s/$rep/$$replace{$rep}/g;
   }
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index 846181a9ead..a2d42cb2c39 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -16,30 +16,31 @@ use Getopt::Std;
 $flags = join (" ", @ARGV);
 
 if (!getopts ('df:hs') || $opt_h) {
-    print "generate_export_file.pl [-d] [-f dependency] [-s] library_name\n";
-    print "\n";
-    print "    -d         Turn on debug mode\n";
-    print "    -f         Adds a dependency to another *_HAS_DLL macro\n";
-    print "    -s         Add in ACE_AS_STATIC_LIBS check\n";
-    print "\n";
-    print "generate_export_file creates the *_export files that are used\n";
-    print "in exporting of symbols for DLLs (and not exporting them when\n";
-    print "the library is static).  If library_name is something like\n";
-    print "\"Foo\", then the file will contain definitions for Foo_Export\n";
-    print "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n";
-    print "FOO_HAS_DLL, etc.\n";
+    print STDERR
+          "generate_export_file.pl [-d] [-f dependency] [-s] library_name\n",
+          "\n",
+          "    -d         Turn on debug mode\n",
+          "    -f         Adds a dependency to another *_HAS_DLL macro\n",
+          "    -s         Add in ACE_AS_STATIC_LIBS check\n",
+          "\n",
+          "generate_export_file creates the *_export files that are used\n",
+          "in exporting of symbols for DLLs (and not exporting them when\n",
+          "the library is static).  If library_name is something like\n",
+          "\"Foo\", then the file will contain definitions for Foo_Export\n",
+          "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n",
+          "FOO_HAS_DLL, etc.\n";
     exit (1);
 }
 
 if (defined $opt_d) {
-    print "Debugging Turned on\n";
+    print STDERR "Debugging Turned on\n";
 
     if (defined $opt_f) {
-        print "Dependency to $opt_f\n";
+        print STDERR "Dependency to $opt_f\n";
     }
 
     if (defined $opt_s) {
-        print "ACE_AS_STATIC_LIBS turned on\n";
+        print STDERR "ACE_AS_STATIC_LIBS turned on\n";
     }
 }