Ignore:
Timestamp:
2011-08-03T21:17:30+12:00 (13 years ago)
Author:
ak19
Message:

The method of locating perl has changed once more: util now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/cgiactions/buildaction.pm

    r24192 r24362  
    3636
    3737use util;
    38 use Config; # for getting the perlpath in the recommended way
    3938
    4039BEGIN {
    … …  
    139138
    140139    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    141     my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\"";
     140    my $cmd = "\"".&util::get_perl_exec()."\" -S full-import.pl \"$collect\"";
    142141
    143142    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    178177
    179178    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    180     my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\"";
     179    my $cmd = "\"".&util::get_perl_exec()."\" -S full-buildcol.pl \"$collect\"";
    181180
    182181    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    216215   
    217216    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    218     my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\"";
     217    my $cmd = "\"".&util::get_perl_exec()."\" -S full-rebuild.pl \"$collect\"";
    219218
    220219    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    256255
    257256    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    258     my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\"";
     257    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-import.pl \"$collect\"";
    259258
    260259    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    295294
    296295    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    297     my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\"";
     296    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-buildcol.pl \"$collect\"";
    298297
    299298    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    334333
    335334    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    336     my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\"";
     335    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl \"$collect\"";
    337336
    338337    my ($status,$report) = $self->run_build_cmd($cmd);
    … …  
    404403       
    405404        ## my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
    406         my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
     405        my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
    407406
    408407        ($status,$report) = $self->run_build_cmd($cmd);
Note: See TracChangeset for help on using the changeset viewer.