Changeset 1678 for trunk/gsdl/bin/script/build

Timestamp:

2000-11-20T14:00:34+13:00 (23 years ago)

Author:

sjboddie

Message:

Re-added some recent changes that got lost when the cvs repository was
moved. This was mostly changes to the collector and building code

File:

• trunk/gsdl/bin/script/build (modified) (4 diffs)

trunk/gsdl/bin/script/build

@@ -24 +24 @@
 use util;
 use cfgread;
+
+# set up path - this allows for paths not to be supplied to system calls
+# and overcomes problems when GSDLHOME contains spaces (double quoting
+# the call doesn't work on win2k and probably other variants of winnt)
+my $path_separator = ":";
+$path_separator = ";" if $ENV{'GSDLOS'} =~ /^windows$/;
+$ENV{'PATH'} = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}) .
+    $path_separator . &util::filename_cat($ENV{'GSDLHOME'}, "bin", "script") .
+    $path_separator . $ENV{'PATH'};
 
 &parse_args (\@ARGV);
@@ -149 +158 @@
         if (-e $download_dir) {
             # copy download_dir and all it contains to the import directory
-            my $download_cmd = "perl " . &util::filename_cat ($bindir, "script", "filecopy.pl");
+            my $download_cmd = "perl -S filecopy.pl";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -out \"$outfile.download\"" if $use_out;
@@ -226 +235 @@
     print $out "importing the $collection collection\n\n";
 
-    my $import_cmd = "perl " . &util::filename_cat ($bindir, "script", "import.pl");
+    my $import_cmd = "perl -S import.pl";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     $import_cmd .= " -removeold" unless $append;
@@ -252 +261 @@
     print $out "building the $collection collection\n\n";
 
-    my $build_cmd = "perl " . &util::filename_cat ($bindir, "script", "buildcol.pl");
+    my $build_cmd = "perl -S buildcol.pl";
     $build_cmd .= " -out \"$outfile.build\"" if $use_out;
     $build_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;