Changeset 17324

Timestamp:

2008-09-18T13:44:55+12:00 (16 years ago)

Author:

oranfry

Message:

made gli honour jre home as well as java home

File:

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

gli/trunk/gli.bat

@@ -262 +262 @@
     if not "%JAVA_HOME%" == "" goto javahome
 
+    :: If it is set, use the JRE_HOME environment variable
+    if not "%JRE_HOME%" == "" goto jrehome
+
     :: Check if Java is on the search path
     echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe JAVAPATH > %TMP%\setjava.bat
@@ -292 +295 @@
 :javahome
     set JAVAPATH=%JAVA_HOME%\bin
+    goto testJava
+    
+:jrehome
+    set JAVAPATH=%JRE_HOME%\bin
+    goto testJava
 
 :testJava