Changeset 13932

Timestamp:

2007-02-20T15:28:58+13:00 (17 years ago)

Author:

shaoqun

Message:

make the testing java right

File:

• trunk/gsdl3/gs3-setup.bat (modified) (2 diffs)

trunk/gsdl3/gs3-setup.bat

@@ -43 +43 @@
 :: Some users may set the above line manually
 if not "%JAVAPATH%" == "" goto testJava
+   
+:: If it is set, use the JAVA_HOME environment variable
+    if not "%JAVA_HOME%" == "" goto javahome
 
-    :: If it is set, use the JAVA_HOME environment variable
-    if not "%JAVA_HOME%" == "" goto exit
+    :: Check if Java is on the search path
+    echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe JAVAPATH > setjava.bat
+    call setjava.bat
+    del setjava.bat
+    echo %JAVAPATH%
+    if not "%JAVAPATH%" == "" goto testJava
 
-    :: Look in the registry for Java SDK installations
+    :: Still haven't found anything, so try looking in the registry (gulp!)
     type nul > jdk.reg
     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
     type jdk.reg > jdk.txt
     del jdk.reg
+    type nul > jre.reg
+    regedit /E jre.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment"
+    type jre.reg > jre.txt
+    del jre.reg
 
-    winutil\findjava.exe jdk.txt | winutil\setvar.exe JAVAPATH > setjava.bat
+    winutil\findjava.exe jdk.txt jre.txt | winutil\setvar.exe JAVAPATH > setjava.bat
     del jdk.txt
+    del jre.txt
     call setjava.bat
     del setjava.bat
 
-    :: If a suitable installation was found in the registry, check it
-    if not "%JAVAPATH%" == "" goto testJava
+    :: If nothing was found in the registry, we're stuck
+    if "%JAVAPATH%" == "" goto noJava
+
+    set JAVAPATH=%JAVAPATH%\bin
+    goto testJava
+
+:javahome
+    set JAVAPATH=%JAVA_HOME%\bin
+
+:testJava
+if exist "%JAVAPATH%\java.exe" goto  exit
+
 
 :noJava
@@ -69 +91 @@
     goto exit
 
-:testJava
-set JAVA_HOME=%JAVAPATH%
+:exit
 
-:exit
+
+