Changeset 36090 for main

Timestamp:

2022-03-10T08:54:26+13:00 (2 years ago)

Author:

kjdon

Message:

if no JAVA_HOME set, don't give up, try to find java on the search path. Code copied from makegli, which will use javac on search path if no JAVA_HOME set. otherwise it led to a situation where you can compile gli but can't run client gli, due to java issues.

File:

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

main/trunk/gli/findjava.bat

@@ -61 +61 @@
 
 :tryJava
-if "%JAVA_HOME%" == "" goto noJava
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJava
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
     if "%GLILANG%" == "en" (
         echo.
@@ -79 +79 @@
     ::set PATH=%GS_JAVA_HOME%\bin;%PATH%
     goto exit
+
+:noJavaHome
+    :: Check if Java is on the search path
+    echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe MYJAVAPATH > setjava.bat
+    call setjava.bat
+    del setjava.bat
+
+    if  "%MYJAVAPATH%" == "" goto noJava
+    set JAVA_EXECUTABLE=%MYJAVAPATH%\java
+    echo JAVA_HOME not set, using java found on search path %JAVA_EXECUTABLE%
+    goto exit
 
 :noJava