Changeset 31461

Timestamp:

2017-03-06T17:08:44+13:00 (7 years ago)

Author:

ak19

Message:

Corrections to commit of revision 31447, to handle further cases: even if the JAVA_HOME/JRE_HOME found by search4j were not of the correct bitness for the GS3 installation, if there's no bundled JRE, then shouldn't just check for a system JAVA_HOME or JRE_HOME but use the one found by search4j (and proceed to warn about the incompatibility, as before).

File:

• main/trunk/greenstone3/gs3-setup.bat (modified) (5 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -196 +196 @@
     if !ERRORLEVEL! equ 1 echo *** The detected system JDK java is an incompatible bit architecture& goto testjre   
     if !ERRORLEVEL! equ 0 (
-        echo *** The detected system JDK java is a matching %bitness% bit
-        echo *** Using the system JAVA_HOME detected
-        set JAVA_HOME=!FOUNDJAVAHOME!
-        set PATH=!FOUNDJAVAHOME!\bin;!PATH!
-        set RUNJAVA=!FOUNDJAVAHOME!\bin\java.exe
-        goto summaryThenEnd
+        echo *** The detected system JDK java is a matching %bitness% bit       
+        goto setupjavahome
     )   
 )
@@ -213 +209 @@
         rem The JRE_HOME found by search4j may be the bundled JRE, overriding any system JRE_HOME,
         rem because the bundled JRE_HOME was provided as HINT to search4j.      
-        echo *** The detected JRE java is a matching %bitness% bit
-        echo *** Using the JRE_HOME detected
-        set JRE_HOME=!FOUNDJREHOME!
-        set PATH=!FOUNDJREHOME!\bin;!PATH!
-        set RUNJAVA=!FOUNDJREHOME!\bin\java.exe
-        goto summaryThenEnd
+        echo *** The detected JRE java is a matching %bitness% bit          
+        goto setupjrehome
     )   
 )
@@ -228 +220 @@
 if exist "!HINT!\bin\java.exe" (
   echo *** Changing to use the GS bundled 32-bit jre.
-  set JAVA_HOME=!HINT!
+  set JRE_HOME=!HINT!
   set PATH=!JAVA_HOME!\bin;!PATH!
   set RUNJAVA=!JAVA_HOME!\bin\java.exe
@@ -234 +226 @@
 )
 
-:: 4. Last ditch effort: search4j couldn't find any java, but check any Java env vars set anyway
+:: 4. If no bundled JRE exists either, we'd still need to check if search4j found a JAVA_HOME or JRE_HOME
+:: and use that even if there was a bitness mismatch btw GS3 and the Java found.
+:: Label summaryThenEnd will print out warnings on any mismatch
+:setupjavahome
+if DEFINED FOUNDJAVAHOME  (
+    echo *** Using the system JAVA_HOME detected at !FOUNDJAVAHOME!
+    set JAVA_HOME=!FOUNDJAVAHOME!
+    set PATH=!FOUNDJAVAHOME!\bin;!PATH!
+    set RUNJAVA=!FOUNDJAVAHOME!\bin\java.exe
+    goto summaryThenEnd
+)
+
+:setupjrehome
+if DEFINED FOUNDJREHOME (
+    echo *** Using the JRE_HOME detected at !FOUNDJREHOME!
+    set JRE_HOME=!FOUNDJREHOME!
+    set PATH=!FOUNDJREHOME!\bin;!PATH!
+    set RUNJAVA=!FOUNDJREHOME!\bin\java.exe
+    goto summaryThenEnd
+)
+
+:: 5. Last ditch effort: search4j couldn't find any java, but check any Java env vars set anyway
 echo *** Search4j could not find an appropriate JAVA or JRE.
 echo *** Attempting to use any JAVA_HOME else JRE_HOME in the environment...
@@ -265 +278 @@
 
 :summaryThenEnd
-:: Check that the bitness of any Java found is appropriate and warn if it is not.
+:: 6. Check that the bitness of any Java found is appropriate and warn if it is not.
 "!RUNJAVA!" -d%bitness% -version 2> nul
 if !ERRORLEVEL! equ 1 (
-    echo *** WARNING: Detected mismatch between the bit-ness of your Greenstone installation ^(%bitness% bit^) and the Java found.
+    echo *** WARNING: Detected mismatch between the bit-ness of your Greenstone installation ^(%bitness% bit^)
+    echo *** and the Java found at %RUNJAVA%.
     echo *** Continuing with this Java anyway:
     echo *** This will only affect MG/MGPP collections for searching, and GDBM database collections