ChangeLogTag: Thu Aug 12 09:42:55 2004 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 44 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index 7315b8c9..546aae60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Thu Aug 12 09:42:55 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * clone_build_tree.pl:
+
+          Modified the usage.
+
+        * modules/NMakeProjectCreator.pm:
+        * modules/ProjectCreator.pm:
+        * modules/VC6ProjectCreator.pm:
+        * modules/VC7ProjectCreator.pm:
+
+          Removed code that converted $(...) to %...%.  During testing, it
+          didn't seem necessary and was broken in some instances.  I don't
+          even why it was added in the first place.
+
 Thu Aug 12 03:33:45 UTC 2004  Don Hinton  <don.hinton@vanderbilt.edu>
 
         * templates/vc6dsp.mpd:
@@ -14,12 +29,12 @@ Thu Aug 12 03:33:45 UTC 2004  Don Hinton  <don.hinton@vanderbilt.edu>
 
 Wed Aug 11 19:15:10 2004  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* modules/AutomakeWorkspaceCreator.pm:
-	* templates/automake.mpd:
-	  Changed header macro from nobase_pkginclude_HEADERS to
-	  nobase_include_HEADERS.
-	  Changed installed library headers to include idl_files.
-	  Added support for EXTRA_DIST with list of resource_files.
+        * modules/AutomakeWorkspaceCreator.pm:
+        * templates/automake.mpd:
+          Changed header macro from nobase_pkginclude_HEADERS to
+          nobase_include_HEADERS.
+          Changed installed library headers to include idl_files.
+          Added support for EXTRA_DIST with list of resource_files.
 
 Wed Aug 11 07:45:11 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/clone_build_tree.pl b/clone_build_tree.pl
index 4515e85f..ae308a1a 100755
--- a/clone_build_tree.pl
+++ b/clone_build_tree.pl
@@ -38,6 +38,9 @@ my(@foundFiles) = ();
 my($version)    = '$Id$';
 $version =~ s/.*\s+(\d+[\.\d]+)\s+.*/$1/;
 
+eval 'symlink("", "");';
+my($hasSymlink) = ($@ eq '');
+
 # ******************************************************************
 # Subroutine Section
 # ******************************************************************
@@ -395,26 +398,20 @@ sub usageAndExit {
   }
   my($base) = basename($0);
   my($spc)  = ' ' x (length($base) + 8);
-  if ($^O eq 'MSWin32') {
-    print STDERR "$base v$version\n",
-                 "Usage: $base [-b <builddir>] [-l] [-v] ",
-                 "[build names...]\n\n",
-                 "-b  Set the build directory. It defaults to the ",
-                 "<current directory>/build.\n",
-                 "-v  Enables verbose mode.\n";
-  }
-  else {
-    print STDERR "$base v$version\n",
-                 "Usage: $base [-a] [-b <builddir>] [-d <dmode>] ",
-                 "[-l] [-v]\n",
-                 $spc, "[build names...]\n\n",
-                 "-a  Use absolute paths when creating soft links.\n",
-                 "-b  Set the build directory. It defaults to the ",
-                 "<current directory>/build.\n",
-                 "-d  Set the directory permissions mode.\n",
-                 "-l  Use hard links instead of soft links.\n",
-                 "-v  Enables verbose mode.\n";
-  }
+
+  print STDERR "$base v$version\n",
+               "Usage: $base [-b <builddir>] [-d <dmode>] ",
+               ($hasSymlink ? "[-a] [-l] " : ''),
+               "[-v]\n",
+               $spc, "[build names...]\n\n",
+               ($hasSymlink ?
+               "-a  Use absolute paths when creating soft links.\n" .
+               "-l  Use hard links instead of soft links.\n" : ''),
+               "-b  Set the build directory. It defaults to the ",
+               "<current directory>/build.\n",
+               "-d  Set the directory permissions mode.\n",
+               "-v  Enable verbose mode.\n";
+
   exit(0);
 }
 
@@ -425,7 +422,7 @@ sub usageAndExit {
 
 my($dmode)    = 0777;
 my($absolute) = 0;
-my($hardlink) = ($^O eq 'MSWin32');
+my($hardlink) = !$hasSymlink;
 my($builddir) = getcwd() . '/build';
 my(@builds)   = ();
 
diff --git a/modules/NMakeProjectCreator.pm b/modules/NMakeProjectCreator.pm
index 6230be12..8d73791e 100644
--- a/modules/NMakeProjectCreator.pm
+++ b/modules/NMakeProjectCreator.pm
@@ -51,12 +51,6 @@ sub project_file_name {
 }
 
 
-sub get_env_accessor {
-  #my($self) = shift;
-  return ('%', '%');
-}
-
-
 sub get_dll_exe_template_input_file {
   #my($self) = shift;
   return 'nmakeexe';
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 8748cb0b..3285e4cf 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -849,7 +849,7 @@ sub parse_components {
         ## Convert any $(...) in this line before we process any
         ## wildcard characters.  If we do not, scoped assignments will
         ## not work nor will we get the correct wildcarded file list.
-        $line = $self->relative($line, 0, 1);
+        $line = $self->relative($line);
 
         ## Set up the files array.  If the line contains a wildcard
         ## character use CORE::glob() to get the files specified.
@@ -1184,20 +1184,9 @@ sub parse_define_custom {
               if (!defined $self->{'generated_exts'}->{$tag}) {
                 $self->{'generated_exts'}->{$tag} = {};
               }
-              ## First try to convert the value into a relative path
-              $value = $self->relative($value, 0, 1);
-
-              ## If that didn't work, try to convert it to the
-              ## right environment variable form.
-              if ($value =~ /\$\(.*\)/) {
-                my($envstart, $envend) = $self->get_env_accessor();
-                if (defined $envstart) {
-                  if (!defined $envend) {
-                    $envend = '';
-                  }
-                  $value =~ s/\$\(([^\)]+)\)/$envstart$1$envend/g;
-                }
-              }
+              ## Try to convert the value into a relative path
+              $value = $self->relative($value);
+
               if (($customDefined{$name} & 0x04) != 0) {
                 if ($type eq 'assignment') {
                   $self->process_assignment(
@@ -3318,13 +3307,12 @@ sub relative {
   my($self)            = shift;
   my($value)           = shift;
   my($expand_template) = shift;
-  my($expand_env)      = shift;
 
   if (defined $value) {
     if (UNIVERSAL::isa($value, 'ARRAY')) {
       my(@built) = ();
       foreach my $val (@$value) {
-        push(@built, $self->relative($val, $expand_template, $expand_env));
+        push(@built, $self->relative($val, $expand_template));
       }
       $value = \@built;
     }
@@ -3389,18 +3377,6 @@ sub relative {
               substr($value, $start) =~ s/\$\([^)]+\)/$ival/;
               $whole = $ival;
             }
-            else {
-              if ($expand_env && $self->convert_macros_to_env()) {
-                my($envstart, $envend) = $self->get_env_accessor();
-                if (defined $envstart) {
-                  if (!defined $envend) {
-                    $envend = '';
-                  }
-                  substr($value, $start) =~ s/\$\(([^\)]+)\)/$envstart$1$envend/g;
-                  $whole = "$envstart$1$envend";
-                }
-              }
-            }
           }
           elsif ($expand_template ||
                  $self->expand_variables_from_template_values()) {
@@ -3589,12 +3565,6 @@ sub get_or_symbol {
 }
 
 
-sub convert_macros_to_env {
-  #my($self) = shift;
-  return 0;
-}
-
-
 sub dollar_special {
   #my($self) = shift;
   return 0;
@@ -3652,11 +3622,6 @@ sub override_exclude_component_extensions {
 }
 
 
-sub get_env_accessor {
-  #my($self) = shift;
-  return ();
-}
-
 sub get_dll_exe_template_input_file {
   #my($self) = shift;
   return undef;
diff --git a/modules/VC6ProjectCreator.pm b/modules/VC6ProjectCreator.pm
index dc37a673..ca6bbb10 100644
--- a/modules/VC6ProjectCreator.pm
+++ b/modules/VC6ProjectCreator.pm
@@ -21,12 +21,6 @@ use vars qw(@ISA);
 # Subroutine Section
 # ************************************************************
 
-sub convert_macros_to_env {
-  #my($self) = shift;
-  return 1;
-}
-
-
 sub compare_output {
   #my($self) = shift;
   return 1;
@@ -125,12 +119,6 @@ sub override_exclude_component_extensions {
 }
 
 
-sub get_env_accessor {
-  #my($self) = shift;
-  return ('%', '%');
-}
-
-
 sub get_dll_exe_template_input_file {
   #my($self) = shift;
   return 'vc6dspdllexe';
diff --git a/modules/VC7ProjectCreator.pm b/modules/VC7ProjectCreator.pm
index b01a5682..b1eb7d58 100644
--- a/modules/VC7ProjectCreator.pm
+++ b/modules/VC7ProjectCreator.pm
@@ -120,12 +120,6 @@ sub project_file_name {
 }
 
 
-sub get_env_accessor {
-  #my($self) = shift;
-  return ('%', '%');
-}
-
-
 sub get_dll_exe_template_input_file {
   #my($self) = shift;
   return 'vc7exe';