Show
Ignore:
Timestamp:
12.05.2009 18:31:55 (11 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).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/full-buildcol.pl

    r19409 r19410  
    3232BEGIN { 
    3333    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    34     # for windows, need PERLPATH in order to launch Perl 
    35     if($ENV{'GSDLOS'} =~ m/windows/) { 
    36     die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'}; 
    37     } 
    3834} 
    3935 
     
    4541my $buildcol_cmd = "buildcol.pl -removeold $quoted_argv"; 
    4642if($ENV{'GSDLOS'} =~ m/windows/) { 
    47     $buildcol_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $buildcol_cmd"; 
    48     #$buildcol_cmd = "perl -S $buildcol_cmd"; 
     43    if($ENV{'PERLPATH'}) { 
     44    $buildcol_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $buildcol_cmd"; 
     45    } else { 
     46    $buildcol_cmd = "perl -S $buildcol_cmd"; 
     47    } 
    4948} 
    5049