Changeset 24192 for main/trunk/greenstone2/perllib/cgiactions/buildaction.pm

Timestamp:

2011-06-22T17:39:13+12:00 (13 years ago)

Author:

ak19

Message:

Sam discovered that using dollar-Config{perlpath} in place of dollar-hat-X is the better way to obtain the path to the perl that is being used. We hope this will not be a relative path on the Mac as dollar-hat-x was on Professor Witten's Mac when we tried it there today.

File:

• main/trunk/greenstone2/perllib/cgiactions/buildaction.pm (modified) (8 diffs)

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

@@ -36 +36 @@
 
 use util;
+use Config; # for getting the perlpath in the recommended way
 
 BEGIN {
@@ -138 +139 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-import.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -177 +178 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-buildcol.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -215 +216 @@
     
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-rebuild.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -255 +256 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S incremental-import.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -294 +295 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S incremental-buildcol.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -333 +334 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S incremental-rebuild.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -403 +404 @@
         
         ## my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-        my $cmd = "\"$^X\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
+        my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";
 
         ($status,$report) = $self->run_build_cmd($cmd);