Changeset 24363

Show
Ignore:
Timestamp:
03.08.2011 21:27:23 (8 years ago)
Author:
ak19
Message:

The method of locating perl has changed once more: util.pm now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use. On Windows, setup.bat sets up the PERLPATH env var to the perl included with Greenstone when working with binaries. The same is done for Linux for symmetry, although perl is not included with GS in a linux GS binary at present.

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bash

    r23947 r24363  
    317317if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl" ] ; then 
    318318 
    319     PATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin:$PATH 
    320     export PATH 
     319    if [ -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin" ] ; then 
     320        PERLPATH=$GSDLHOME/bin/$GSDLOS$GSDLARCH/perl/bin 
     321        export PERLPATH 
     322        PATH=$PERLPATH:$PATH 
     323        export PATH 
     324    fi    
    321325 
    322326    if test "$GSDLOS" = "linux" ; then 
  • main/trunk/greenstone2/setup.bat

    r23665 r24363  
    3939 
    4040if "!GS_CP_SET!" == "yes" goto Success 
    41 set PATH=!GSDLHOME!\bin\windows\perl\bin;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH! 
     41set PATH=!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH! 
     42if exist "!GSDLHOME!\bin\windows\perl\bin" ( 
     43    set PERLPATH=!GSDLHOME!\bin\windows\perl\bin 
     44    set PATH=!PERLPATH!;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH!  
     45) 
     46 
    4247set GS_CP_SET=yes 
    4348goto Success 
     
    6166 
    6267if "!GS_CP_SET!" == "yes" goto Success 
    63 set PATH="!GSDLHOME!\bin\windows\perl\bin";"!GSDLHOME!\bin\windows";"!GSDLHOME!\bin\script";"!PATH!" 
     68set PATH=!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH! 
     69if exist "!GSDLHOME!\bin\windows\perl\bin" ( 
     70    set PERLPATH=!GSDLHOME!\bin\windows\perl\bin 
     71    set PATH=!PERLPATH!;!GSDLHOME!\bin\windows;!GSDLHOME!\bin\script;!PATH!  
     72) 
    6473set GS_CP_SET=yes 
    6574goto Success