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/incremental-buildcol.pl

    r19409 r19410  
    3535    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
    3636    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    37  
    38     # for windows, need PERLPATH in order to launch Perl 
    39     if($ENV{'GSDLOS'} =~ m/windows/) { 
    40      die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'}; 
    41     } 
    4237} 
    4338 
     
    110105    my $buildcol_cmd = "buildcol.pl"; 
    111106    if($ENV{'GSDLOS'} =~ m/windows/) { 
    112     $buildcol_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $buildcol_cmd"; 
    113     #$buildcol_cmd = "perl -S $buildcol_cmd"; 
     107    if($ENV{'PERLPATH'}) { 
     108        $buildcol_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $buildcol_cmd"; 
     109    } else { 
     110        $buildcol_cmd = "perl -S $buildcol_cmd"; 
     111    } 
    114112    } 
    115113