Changeset 33932

Timestamp:

2020-02-15T19:14:24+13:00 (4 years ago)

Author:

davidb

Message:

Commented out Java version warning message, as it presents as something that looks like a big issue (just from the number of lines printed out, even though it is marked as a warning, it does so in SCARY ALL CAPS) when it isn't

File:

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

main/trunk/greenstone3/gs3-setup.bat

@@ -282 +282 @@
 :: 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 JDK or JRE java.
-echo     Attempting to use any JAVA_HOME else JRE_HOME in the environment...
+echo     Checking for Java explicitly set through environment variables
+:echo     Attempting to use any JAVA_HOME else JRE_HOME in the environment...
 
 if exist "!JAVA_HOME!\bin\java.exe" (
@@ -288 +289 @@
   set RUNJAVA=!JAVA_HOME!\bin\java.exe
   echo Using Java at !JAVA_HOME!
-  echo WARNING: Greenstone has not checked the version number of this Java installation
-  echo          The source distribution of Greenstone3 requires Java 1.5 or greater
-  echo          SVN users may still use Java 1.4
-  echo.
+:  echo WARNING: Greenstone has not checked the version number of this Java installation
+:  echo          The source distribution of Greenstone3 requires Java 1.5 or greater
+:  echo          SVN users may still use Java 1.4
+:  echo.
   goto summaryThenEnd
 )
@@ -299 +300 @@
   set RUNJAVA=!JRE_HOME!\bin\java.exe
   echo Using Java at !JRE_HOME!
-  echo WARNING: Greenstone has not checked the version number of this JRE installation
-  echo          The source distribution of Greenstone3 requires Java 1.5 or greater
-  echo          SVN users may still use Java 1.4
-  echo.
+:  echo WARNING: Greenstone has not checked the version number of this JRE installation
+:  echo          The source distribution of Greenstone3 requires Java 1.5 or greater
+:  echo          SVN users may still use Java 1.4
+:  echo.
   goto summaryThenEnd
 )