Changeset 24192 for main/trunk/greenstone2/perllib
- Timestamp:
- 2011-06-22T17:39:13+12:00 (13 years ago)
- Location:
- main/trunk/greenstone2/perllib
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/cgiactions/baseaction.pm
r24126 r24192 30 30 31 31 use inexport; 32 use Config; # for getting the perlpath in the recommended way 32 33 33 34 our $authenication_enabled = 0; … … 433 434 my $gsdl_cgi = $self->{'gsdl_cgi'}; 434 435 435 my $sendmail_command = "\"$ ^X\" -S sendmail.pl";436 my $sendmail_command = "\"$Config{perlpath}\" -S sendmail.pl"; 436 437 $sendmail_command .= " -to \"" . $mail_to_address . "\""; 437 438 $sendmail_command .= " -from \"" . $mail_from_address . "\""; … … 462 463 $perl_args = "-collectdir \"$collect_dir\" " . $perl_args; 463 464 464 my $perl_command = "\"$ ^X\" -S $script $perl_args";465 my $perl_command = "\"$Config{perlpath}\" -S $script $perl_args"; 465 466 466 467 -
main/trunk/greenstone2/perllib/cgiactions/buildaction.pm
r24126 r24192 36 36 37 37 use util; 38 use Config; # for getting the perlpath in the recommended way 38 39 39 40 BEGIN { … … 138 139 139 140 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 140 my $cmd = "\"$ ^X\" -S full-import.pl \"$collect\"";141 my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\""; 141 142 142 143 my ($status,$report) = $self->run_build_cmd($cmd); … … 177 178 178 179 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 179 my $cmd = "\"$ ^X\" -S full-buildcol.pl \"$collect\"";180 my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\""; 180 181 181 182 my ($status,$report) = $self->run_build_cmd($cmd); … … 215 216 216 217 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 217 my $cmd = "\"$ ^X\" -S full-rebuild.pl \"$collect\"";218 my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\""; 218 219 219 220 my ($status,$report) = $self->run_build_cmd($cmd); … … 255 256 256 257 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 257 my $cmd = "\"$ ^X\" -S incremental-import.pl \"$collect\"";258 my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\""; 258 259 259 260 my ($status,$report) = $self->run_build_cmd($cmd); … … 294 295 295 296 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 296 my $cmd = "\"$ ^X\" -S incremental-buildcol.pl \"$collect\"";297 my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\""; 297 298 298 299 my ($status,$report) = $self->run_build_cmd($cmd); … … 333 334 334 335 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 335 my $cmd = "\"$ ^X\" -S incremental-rebuild.pl \"$collect\"";336 my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\""; 336 337 337 338 my ($status,$report) = $self->run_build_cmd($cmd); … … 403 404 404 405 ## my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 405 my $cmd = "\"$ ^X\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\"";406 my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl -manifest \"$manifest_filename\" \"$collect\""; 406 407 407 408 ($status,$report) = $self->run_build_cmd($cmd); -
main/trunk/greenstone2/perllib/cgiactions/indexaction.pm
r24126 r24192 31 31 32 32 use cgiactions::baseaction; 33 33 use Config; # for getting the perlpath in the recommended way 34 34 35 35 … … 133 133 134 134 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 135 my $cmd = "\"$ ^X\" -S full-import.pl \"$collect\"";135 my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\""; 136 136 137 137 my ($status,$report) = $self->run_build_cmd($cmd); … … 172 172 173 173 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 174 my $cmd = "\"$ ^X\" -S full-buildcol.pl \"$collect\"";174 my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\""; 175 175 176 176 my ($status,$report) = $self->run_build_cmd($cmd); … … 211 211 212 212 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 213 my $cmd = "\"$ ^X\" -S full-rebuild.pl \"$collect\"";213 my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\""; 214 214 215 215 my ($status,$report) = $self->run_build_cmd($cmd); … … 251 251 252 252 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 253 my $cmd = "\"$ ^X\" -S incremental-import.pl \"$collect\"";253 my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\""; 254 254 255 255 my ($status,$report) = $self->run_build_cmd($cmd); … … 292 292 293 293 my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 294 my $cmd = "\"$ ^X\" -S incremental-buildcol.pl \"$collect\"";294 my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\""; 295 295 296 296 my ($status,$report) = $self->run_build_cmd($cmd); … … 329 329 $self->lock_collection($username, $collect); 330 330 331 my $cmd = "\"$ ^X\" -S incremental-rebuild.pl \"$collect\"";331 my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\""; 332 332 333 333 my ($status,$report) = $self->run_build_cmd($cmd); -
main/trunk/greenstone2/perllib/g2futil.pm
r24126 r24192 15 15 use strict; 16 16 use util; 17 use Config; # for getting the perlpath in the recommended way 17 18 18 19 sub run_cmd_old … … 63 64 } 64 65 if (($prog =~ m/.pl$/i) && ($ENV{'GSDLOS'} =~ m/^windows/)) { 65 $prog ="\"$ ^X\" -S $prog";66 $prog ="\"$Config{perlpath}\" -S $prog"; 66 67 } 67 68 -
main/trunk/greenstone2/perllib/lucenebuilder.pm
r24126 r24192 44 44 use strict; 45 45 no strict 'refs'; 46 46 use Config; # for getting the perlpath in the recommended way 47 47 48 48 sub BEGIN { … … 82 82 else 83 83 { 84 $self->{'full_lucene_passes_exe'} = "\"$ ^X\" -S \"$lucene_passes_script\"";84 $self->{'full_lucene_passes_exe'} = "\"$Config{perlpath}\" -S \"$lucene_passes_script\""; 85 85 } 86 86 -
main/trunk/greenstone2/perllib/plugins/ConvertBinaryFile.pm
r24126 r24192 44 44 no strict 'refs'; # allow filehandles to be variables and viceversa 45 45 no strict 'subs'; 46 use Config; # for getting the perlpath in the recommended way 47 46 48 47 49 sub BEGIN { … … 277 279 # } 278 280 279 my $cmd = "\"$ ^X\" -S gsConvert.pl -verbose $verbosity ";281 my $cmd = "\"$Config{perlpath}\" -S gsConvert.pl -verbose $verbosity "; 280 282 if (defined $self->{'convert_options'}) { 281 283 $cmd .= $self->{'convert_options'} . " "; -
main/trunk/greenstone2/perllib/plugins/ConvertToRogPlugin.pm
r24126 r24192 31 31 use strict; 32 32 no strict 'refs'; # allow filehandles to be variables and viceversa 33 use Config; # for getting the perlpath in the recommended way 33 34 34 35 sub BEGIN { … … 121 122 # making sure the converter gives us the appropriate output type 122 123 my $output_type = lc($convert_to); 123 my $cmd = "\"$ ^X\" -S gsMusicConvert.pl -verbose $verbosity -errlog \"$errlog\" -output $output_type \"$tmp_filename\"";124 my $cmd = "\"$Config{perlpath}\" -S gsMusicConvert.pl -verbose $verbosity -errlog \"$errlog\" -output $output_type \"$tmp_filename\""; 124 125 $output_type = `$cmd`; 125 126
Note:
See TracChangeset
for help on using the changeset viewer.