Changeset 1179

Timestamp:

2000-05-19T17:00:12+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/gsdl/bin

Files:

• script/filecopy.pl (modified) (5 diffs)
• windows/build.bat (modified) ( previous)

trunk/gsdl/bin/script/filecopy.pl

@@ -32 +32 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-
-    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/lib");
-    $ENV{'PATH'} = "$ENV{'GSDLHOME'}/perllib/cpan/bin:$ENV{'PATH'}";
 }
 
@@ -83 +80 @@
     {
         my $src_file = $f;
-        my $dst_file = &util::filename_cat($full_importname,$f);
+        my $dst_file = &get_dst_dir ($full_importname,$f);
 
         my $do_copy = "no";
@@ -104 +101 @@
         if ($do_copy eq "yes")
         {
-        print STDOUT "Copying $src_file\n";
+        print STDOUT "Copying $src_file-->$dst_file\n";
         &util::cp($src_file,$dst_file);
         }
@@ -117 +114 @@
     {
         my $src_dir = $d;
-        my $dst_dir = &util::filename_cat($full_importname,$d);
+        my $dst_dir = &get_dst_dir ($full_importname, $d);
         if (!-e $dst_dir)
         {
@@ -153 +150 @@
 }
 
+sub get_dst_dir {
+    my ($full_importname, $dir) = @_;
+
+    if ($ENV{'GSDLOS'} eq "windows") {
+    # don't want windows filenames like c:\gsdl\...\import\c:\dir
+    $dir =~ s/^[a-z]:[\\\/]//i;
+    }
+    return &util::filename_cat($full_importname,$dir);
+}
+
 &main();
-
-
-
-