Changeset 19410 for gsdl/trunk/bin/script/full-import.pl

Timestamp:

2009-05-12T18:31:55+12:00 (15 years ago)

Author:

ak19

Message:

Further modifications to launching perl on windows in the new incremental and full building scripts: Removed the check inside the BEGIN statement that insisted on PERLPATH being defined. Now the code uses PERLPATH for launching Perl on Windows if this is defined, otherwise it refers to just perl (assuming it is on the PATH already).

File:

• gsdl/trunk/bin/script/full-import.pl (modified) (2 diffs)

gsdl/trunk/bin/script/full-import.pl

@@ -33 +33 @@
 BEGIN {
     die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
-    # for windows, need PERLPATH in order to launch Perl
-    if($ENV{'GSDLOS'} =~ m/windows/) {
-    die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'};
-    }
 }
 
@@ -45 +41 @@
 my $import_cmd = "import.pl -removeold $quoted_argv";
 if($ENV{'GSDLOS'} =~ m/windows/) {
-    $import_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $import_cmd";
-    #$import_cmd = "perl -S $import_cmd";
+    if($ENV{'PERLPATH'}) {
+    $import_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $import_cmd";
+    } else {
+    $import_cmd = "perl -S $import_cmd";
+    }
 }