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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/findjava.bat

    r20816 r24829  
    11@echo off 
     2 
     3setlocal enabledelayedexpansion 
    24 
    35:: Environment Variables passed in: _VERSION, GLILANG and possibly also 
     
    2123    :: else we look for a compiled version of search4j in a GS installation 
    2224    if "%_VERSION%" == "2" ( 
    23         set SEARCH4J_EXECUTABLE=%GSDLHOME%\bin\windows\search4j.exe 
    24         set HINT=%GSDLHOME%\packages\jre 
     25        set SEARCH4J_EXECUTABLE=!GSDLHOME!\bin\windows\search4j.exe 
     26        set HINT=!GSDLHOME!\packages\jre 
    2527    ) 
    2628    if "%_VERSION%" == "3" ( 
    27         set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe 
    28         set HINT=%GSDL3SRCHOME%\packages\jre 
     29        set SEARCH4J_EXECUTABLE=!GSDL3SRCHOME!\bin\search4j.exe 
     30        set HINT=!GSDL3SRCHOME!\packages\jre 
    2931    ) 
    3032    if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava 
     
    5658            echo WARNING:  
    5759        echo Java Runtime not bundled with this Greenstone installation. 
    58         echo Using JAVA_HOME: %JAVA_HOME% 
     60        echo Using JAVA_HOME: !JAVA_HOME! 
    5961        echo ^(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.^) 
    6062        echo *************************************************************************** 
     
    9799set MIN_VERSION= 
    98100set DISPLAY_MIN_VERSION= 
     101 
     102endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME%