Changeset 28740 for other-projects/expeditee-release-kits/scripts/bin/findjava.bat

Timestamp:

2013-12-03T16:20:10+13:00 (10 years ago)

Author:

ak19

Message:

Expeditee team (jts21). Add shared/windows folder with self-extracting Java 8 JRE, moved windows_wrapper.cpp to shared/windows/wrapper/wrapper.cpp, fixed run/findjava scripts

File:

• other-projects/expeditee-release-kits/scripts/bin/findjava.bat (modified) (2 diffs)

other-projects/expeditee-release-kits/scripts/bin/findjava.bat

@@ -18 +18 @@
 set MIN_VERSION=1.8.0_00
 set SEARCH4J_EXECUTABLE=search4j.exe
+::set HINT=%EXPEDITEE_HOME%\packages\jre
+set HINT=packages\jre
 if exist %SEARCH4J_EXECUTABLE% goto setJexec
-set SEARCH4J_EXECUTABLE=!EXPEDITEE_HOME!\bin\search4j.exe
-set HINT=!EXPEDITEE_HOME!\packages\jre
+set SEARCH4J_EXECUTABLE=%EXPEDITEE_HOME%\bin\search4j.exe
 if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava
 
 :: JAVA_EXECUTABLE is the value returned by running search4j -e -m MIN_VERSION -p HINT
-:: for /f "tokens=*" %%G in ('"%SEARCH4J_EXECUTABLE% -e -m %MIN_VERSION% -p %HINT%"') do set JAVA_EXECUTABLE=%%G
 :setJexec
-    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -e -m '%MIN_VERSION%' -p '%HINT%'`) do set JAVA_EXECUTABLE=%%G
+    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -e -m '%MIN_VERSION%' -p %HINT%`) do set JAVA_EXECUTABLE=%%G
+    
     if "%JAVA_EXECUTABLE%" == "" goto noJava
     echo Java:
@@ -33 +34 @@
 
     :: we know that works, so we can set the local javahome (for Expeditee) as well
-    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -m '%MIN_VERSION%' -p '%HINT%'`) do set EXP_JAVA_HOME=%%G
+    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -m '%MIN_VERSION%' -p %HINT%`) do set EXP_JAVA_HOME=%%G
 
 :: found java, JAVA_EXECUTABLE and EXP_JAVA_HOME env vars set, can exit this script