Changeset 32986

Timestamp:

2019-04-05T14:40:04+13:00 (5 years ago)

Author:

ak19

Message:

Modifications to improve gs2build setup.bat's warning messages when JAVA/JRE_HOME not found on a machine. These warnings are premature on GS3 and can be non-fatal as gs3-setup still needs to check for the existence of a bundled JRE and make sure its bitness is suitable, in which case the non-detection of JAVA/JRE at gs2build level is non-fatal.

Location:

main/trunk

Files:

• greenstone2/setup.bat (modified) (1 diff)
• greenstone3/gs3-setup.bat (modified) (1 diff)

main/trunk/greenstone2/setup.bat

@@ -271 +271 @@
 if not "%JAVA_HOME%" == "" echo JAVA_HOME: %JAVA_HOME%
 if not "%JRE_HOME%" == "" echo JRE_HOME: %JRE_HOME%
-if "%JAVA_HOME%" == "" if "%JRE_HOME%" == "" echo Warning: Neither JAVA_HOME nor JRE_HOME set. Ensure one is set and on PATH.
+:: if GS3, then we'll do some more checking such as bundled JRE if the bitness is right
+if "%GSDL3SRCHOME%" == "" if "%JAVA_HOME%" == "" if "%JRE_HOME%" == "" echo Warning: Neither JAVA_HOME nor JRE_HOME set. Ensure one is set and on PATH.
+if not "%GSDL3SRCHOME%" == "" if "%JAVA_HOME%" == "" if "%JRE_HOME%" == "" echo Neither JAVA_HOME nor JRE_HOME set. Will shortly check for bundled JRE of correct bitness.
 
 :: Perl >= v5.18.* randomises map iteration order within a process

main/trunk/greenstone3/gs3-setup.bat

@@ -308 +308 @@
 echo ERROR: Failed to locate Java
 echo        Please set JAVA_HOME or JRE_HOME to point to an appropriate %bitness% bit Java
+echo        and ensure it is on PATH.
 goto end