Changeset 24829 for main/trunk/gli

Show
Ignore:
Timestamp:
30.11.2011 17:48:15 (8 years ago)
Author:
ak19
Message:

Changes to bat files and perl code to deal with brackets in (Windows) filepath. Also checked winmake.bat files to see if changes were needed there. These changes go together with the commits 24826 to 24828 for gems.bat, and commit 24820 on makegs2.bat.

Location:
main/trunk/gli
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/client-gli.bat

    r19391 r24829  
    11@echo off 
     2setlocal enabledelayedexpansion 
     3 
    24pushd "%CD%" 
    35CD /D "%~dp0" 
     
    9496:: the client side. If we have Perl, pass in GSDLHOME for the -gsdl option and the PERLPATH. 
    9597if "%PERLPATH%" == "" goto nogsdl 
    96     echo Perl and GSDLHOME (%GSDLHOME%) detected. Downloading is enabled. 
     98    echo Perl and GSDLHOME (!GSDLHOME!) detected. Downloading is enabled. 
    9799    echo. 
    98100    "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl "%GSDLHOME%" -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9 
     
    124126set PROGABBR= 
    125127popd 
     128endlocal 
  • main/trunk/gli/findjava.bat

    r20655 r24829  
    11@echo off 
     2setlocal enabledelayedexpansion 
    23 
    34:: Environment Variables passed in: _VERSION, GLILANG and possibly also 
     
    2122    :: else we look for a compiled version of search4j in a GS installation 
    2223    if "%_VERSION%" == "2" ( 
    23         set SEARCH4J_EXECUTABLE=%GSDLHOME%\bin\windows\search4j.exe 
    24         set HINT=%GSDLHOME%\packages\jre 
     24        set SEARCH4J_EXECUTABLE=!GSDLHOME!\bin\windows\search4j.exe 
     25        set HINT=!GSDLHOME!\packages\jre 
    2526    ) 
    26         if "%_VERSION%" == "3" ( 
    27         set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe 
    28         set HINT=%GSDL3SRCHOME%\packages\jre 
     27    if "%_VERSION%" == "3" ( 
     28        set SEARCH4J_EXECUTABLE=!GSDL3SRCHOME!\bin\search4j.exe 
     29        set HINT=!GSDL3SRCHOME!\packages\jre 
    2930    ) 
    3031    if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava 
    3132 
    32 :setJexec     
     33:setJexec 
    3334    "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat 
    3435    call "%TMP%\set_java_executable.bat" 
     
    5657            echo WARNING:  
    5758        echo Java Runtime not bundled with this Greenstone installation. 
    58         echo Using JAVA_HOME: %JAVA_HOME% 
     59        echo Using JAVA_HOME: !JAVA_HOME! 
    5960        echo ^(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.^) 
    6061        echo *************************************************************************** 
     
    9798set MIN_VERSION= 
    9899set DISPLAY_MIN_VERSION= 
     100 
     101endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME% 
  • main/trunk/gli/gli.bat

    r23650 r24829  
    11@echo off 
     2setlocal enabledelayedexpansion 
     3 
    24color 0A 
    35set startdir=%CD% 
     
    4850    echo. 
    4951    echo Checking if the Greenstone collection directory is writable ... 
    50     (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" ) 2>nul 
     52    (echo This is a temporary file. It is safe to delete it. > "!GSDLHOME!\collect\testing.tmp" ) 2>nul 
    5153    if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile  
    5254    if "%1" == "Elevated" goto printWarning 
    5355    echo ... FAILED 
    54     echo The %PROGNAME% cannot write to the collection directory (%GSDLHOME%\collect) 
     56    echo The %PROGNAME% cannot write to the collection directory (!GSDLHOME!\collect) 
    5557    echo Requesting elevated status to become admin user to continue. 
    5658    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9 
     
    5961:printWarning 
    6062    echo ... FAILED 
    61     echo The %PROGNAME% cannot write to the log directory (%GSDLHOME%\collect).  
     63    echo The %PROGNAME% cannot write to the log directory (!GSDLHOME!\collect).  
    6264    echo Attempting to continue without permissions. 
    6365    goto shiftElevated 
     
    114116if not "%GSDL3SRCHOME%" == "" ( 
    115117    echo GSDL3SRCHOME: 
    116     echo %GSDL3SRCHOME% 
     118    echo !GSDL3SRCHOME! 
    117119    echo. 
    118120) 
     
    120122if not "%GSDL3HOME%" == "" ( 
    121123    echo GSDL3HOME: 
    122     echo %GSDL3HOME% 
     124    echo !GSDL3HOME! 
    123125    echo. 
    124126) 
     
    126128if not "%GSDLHOME%" == "" ( 
    127129    echo GSDLHOME: 
    128     echo %GSDLHOME% 
     130    echo !GSDLHOME! 
    129131    echo. 
    130132) 
     
    166168:localLib 
    167169    if exist "%GSDLHOME%\server.exe" ( 
    168     set locallib=%GSDLHOME%\server.exe 
     170    set locallib=!GSDLHOME!\server.exe 
    169171    ) else ( 
    170     set locallib=%GSDLHOME%\gs2-web-server.bat 
     172    set locallib=!GSDLHOME!\gs2-web-server.bat 
    171173    ) 
    172174 
     
    211213cd "%startdir%" 
    212214set startdir= 
     215 
     216endlocal 
  • main/trunk/gli/makejar.bat

    r24782 r24829  
    11echo off 
     2setlocal enabledelayedexpansion 
     3 
    24pushd "%CD%" 
    35CD /D "%~dp0" 
     
    115117 
    116118  cd jar 
    117   "%JARPATH%\jar" xf ..\lib\apache.jar com org 
    118   "%JARPATH%\jar" xf ..\lib\qfslib.jar de 
     119  "!JARPATH!\jar" xf ..\lib\apache.jar com org 
     120  "!JARPATH!\jar" xf ..\lib\qfslib.jar de 
    119121 
    120122  cd .. 
     
    152154 
    153155    if not exist appletstore ( 
    154       "%JARPATH%\keytool" -genkey -alias privateKey -keystore appletstore -storepass greenstone 
     156      "!JARPATH!\keytool" -genkey -alias privateKey -keystore appletstore -storepass greenstone 
    155157    ) 
    156158 
     
    158160    if exist appletpasswd ( 
    159161      echo Using jarsigner to make signed jar file ... 
    160       "%JARPATH%\jarsigner" -keystore appletstore -signedjar SignedGatherer.jar GLI.jar privateKey < appletpasswd >NUL 2>NUL 
     162      "!JARPATH!\jarsigner" -keystore appletstore -signedjar SignedGatherer.jar GLI.jar privateKey < appletpasswd >NUL 2>NUL 
    161163      echo ... done. 
    162164    ) ELSE ( 
    163       "%JARPATH%\jarsigner" -keystore appletstore -signedjar SignedGatherer.jar GLI.jar privateKey 
     165      "!JARPATH!\jarsigner" -keystore appletstore -signedjar SignedGatherer.jar GLI.jar privateKey 
    164166    ) 
    165167    echo Installing SignedGatherer in ..\bin\java 
     
    169171 
    170172popd 
     173endlocal