Changeset 20767

Timestamp:

2009-09-30T16:46:59+13:00 (15 years ago)

Author:

ak19

Message:

The file used to make reference to a winutil folder containing setvar.exe, but that only exists in the GLI folder. Now will have a copy of setvar.exe in win bin, so we will refer to that one (setup.bat needs to have been called first to know the location of win bim).

File:

• gsdl/trunk/findjava.bat (modified) (3 diffs)

gsdl/trunk/findjava.bat

@@ -24 +24 @@
         set HINT=%GSDLHOME%\packages\jre
     )
-        if "%_VERSION%" == "3" (
+    if "%_VERSION%" == "3" (
         set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe
         set HINT=%GSDL3SRCHOME%\packages\jre
@@ -30 +30 @@
     if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava
 
-:setJexec    
-    "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
+:setJexec
+    "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
     call "%TMP%\set_java_executable.bat"
     del "%TMP%\set_java_executable.bat"
@@ -41 +41 @@
 
     :: we know that works, so we can set the local javahome (for Greenstone) as well
-    "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat
+    "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat
     call "%TMP%\set_java_home.bat"
     del "%TMP%\set_java_home.bat"