Changeset 32986 for main

Show
Ignore:
Timestamp:
05.04.2019 14:40:04 (8 months 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bat

    r32420 r32986  
    271271if not "%JAVA_HOME%" == "" echo JAVA_HOME: %JAVA_HOME% 
    272272if not "%JRE_HOME%" == "" echo JRE_HOME: %JRE_HOME% 
    273 if "%JAVA_HOME%" == "" if "%JRE_HOME%" == "" echo Warning: Neither JAVA_HOME nor JRE_HOME set. Ensure one is set and on PATH. 
     273:: if GS3, then we'll do some more checking such as bundled JRE if the bitness is right 
     274if "%GSDL3SRCHOME%" == "" if "%JAVA_HOME%" == "" if "%JRE_HOME%" == "" echo Warning: Neither JAVA_HOME nor JRE_HOME set. Ensure one is set and on PATH. 
     275if 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. 
    274276 
    275277:: Perl >= v5.18.* randomises map iteration order within a process 
  • main/trunk/greenstone3/gs3-setup.bat

    r32969 r32986  
    308308echo ERROR: Failed to locate Java 
    309309echo        Please set JAVA_HOME or JRE_HOME to point to an appropriate %bitness% bit Java 
     310echo        and ensure it is on PATH. 
    310311goto end 
    311312