Changeset 19410 for gsdl/trunk


Ignore:
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).

Location:
gsdl/trunk/bin/script
Files:
6 edited

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

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

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

  • gsdl/trunk/bin/script/full-rebuild.pl

    r19409 r19410  
    3737    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
    3838    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    39 
    40     # for windows, need PERLPATH in order to launch Perl
    41     if($ENV{'GSDLOS'} =~ m/windows/) {
    42      die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'};
    43     }
    4439}
    4540
    … …  
    109104
    110105    my $launch_cmd = "";
    111     $launch_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S " if($ENV{'GSDLOS'} =~ m/windows/);
     106    if($ENV{'GSDLOS'} =~ m/windows/) {
     107    if($ENV{'PERLPATH'}) {
     108        $launch_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S ";
     109    } else {
     110        $launch_cmd = "perl -S ";
     111    }
     112    }
    112113   
    113114    print "\n";

  • 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

  • gsdl/trunk/bin/script/incremental-import.pl

    r19409 r19410  
    3636    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
    3737    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    38 
    39     # for windows, need PERLPATH in order to launch Perl
    40     if($ENV{'GSDLOS'} =~ m/windows/) {
    41      die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'};
    42     }
    4338}
    4439
    … …  
    113108    my $import_cmd = "import.pl";
    114109    if($ENV{'GSDLOS'} =~ m/windows/) {
    115     $import_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $import_cmd";
    116     #$import_cmd = "perl -S $import_cmd";
     110    if($ENV{'PERLPATH'}) {
     111        $import_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S $import_cmd";
     112    } else {
     113        $import_cmd = "perl -S $import_cmd";
     114    }
    117115    }
    118116    if (-e $archiveinf_doc) {

  • gsdl/trunk/bin/script/incremental-rebuild.pl

    r19409 r19410  
    3737    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'};
    3838    unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
    39 
    40     # for windows, need PERLPATH in order to launch Perl
    41     if($ENV{'GSDLOS'} =~ m/windows/) {
    42      die "PERLPATH, which is required for Windows, is not set.\n" unless defined $ENV{'PERLPATH'};
    43     }
    4439}
    4540
    … …  
    7166   
    7267    my $launch_cmd = "";
    73     $launch_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S " if($ENV{'GSDLOS'} =~ m/windows/);
     68    if($ENV{'GSDLOS'} =~ m/windows/) {
     69    if($ENV{'PERLPATH'}) {
     70        $launch_cmd = "$ENV{'PERLPATH'}\\Perl.exe -S ";
     71    } else {
     72        $launch_cmd = "perl -S ";
     73    }
     74    }
    7475
    7576    print "\n";
Note: See TracChangeset for help on using the changeset viewer.