Changeset 24829 for main/trunk/gli/findjava.bat

Timestamp:

2011-11-30T17:48:15+13:00 (12 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.

File:

• main/trunk/gli/findjava.bat (modified) (4 diffs)

main/trunk/gli/findjava.bat

@@ -1 +1 @@
 @echo off
+setlocal enabledelayedexpansion
 
 :: Environment Variables passed in: _VERSION, GLILANG and possibly also
@@ -21 +22 @@
     :: else we look for a compiled version of search4j in a GS installation
     if "%_VERSION%" == "2" (
-        set SEARCH4J_EXECUTABLE=%GSDLHOME%\bin\windows\search4j.exe
-        set HINT=%GSDLHOME%\packages\jre
+        set SEARCH4J_EXECUTABLE=!GSDLHOME!\bin\windows\search4j.exe
+        set HINT=!GSDLHOME!\packages\jre
     )
-        if "%_VERSION%" == "3" (
-        set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe
-        set HINT=%GSDL3SRCHOME%\packages\jre
+    if "%_VERSION%" == "3" (
+        set SEARCH4J_EXECUTABLE=!GSDL3SRCHOME!\bin\search4j.exe
+        set HINT=!GSDL3SRCHOME!\packages\jre
     )
     if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava
 
-:setJexec    
+:setJexec
     "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
     call "%TMP%\set_java_executable.bat"
@@ -56 +57 @@
             echo WARNING: 
         echo Java Runtime not bundled with this Greenstone installation.
-        echo Using JAVA_HOME: %JAVA_HOME%
+        echo Using JAVA_HOME: !JAVA_HOME!
         echo ^(NOTE: this needs to be %DISPLAY_MIN_VERSION% or higher.^)
         echo ***************************************************************************
@@ -97 +98 @@
 set MIN_VERSION=
 set DISPLAY_MIN_VERSION=
+
+endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME%