Changeset 31469 for main/trunk

Timestamp:

2017-03-07T18:19:54+13:00 (7 years ago)

Author:

ak19

Message:

1. Failing gracefully if we can't determine the bitness of GS3 (for example, it's still compiling up or has to be compiled up, but we run gs3-devel.bat in preparation for compiling>. 2. Better variable naming and messages.

File:

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

main/trunk/greenstone3/gs3-setup.bat

@@ -126 +126 @@
 :: ---- Search for java ----
 set JAVA_MIN_VERSION=1.5.0_00
-set HINT=!CD!\packages\jre
+set BUNDLED_JRE=!CD!\packages\jre
+set HINT=!BUNDLED_JRE!
 
 ::if search4j is present, use it
@@ -167 +168 @@
 :: http://stackoverflow.com/questions/6474738/batch-file-for-f-doesnt-work-if-path-has-spaces
 :: Could use shortfilenames, see http://stackoverflow.com/questions/10227144/convert-long-filename-to-short-filename-8-3-using-cmd-exe
-for /f "usebackq tokens=2 delims= " %%G IN (`call "%GSDLHOME%\bin\windows\GNUfile\bin\file.exe" "%GSDL3SRCHOME%\lib\jni\gdbmjava.dll"`) do set bitness=%%G
+for /f "usebackq tokens=2 delims= " %%G IN (`call "%GSDLHOME%\bin\windows\GNUfile\bin\file.exe" "%GSDL3SRCHOME%\bin\search4j.exe"`) do set bitness=%%G
+
+echo JAVAHOME: %JAVA_HOME%
+if not "%FOUNDJAVAHOME%" == "" echo FOUNDJAVAHOME !FOUNDJAVAHOME!
+if not "%FOUNDJREHOME%" == "" echo FOUNDJAVAHOME !FOUNDJREHOME!
 
 if "%bitness%" == "PE32+" (
@@ -177 +182 @@
         echo The installed Greenstone is 32 bit
     ) else (
-        echo WARNING: Greenstone installation is of unknown bitness. "%bitness%" is neither 32 nor 64 bit& goto bundledjre
+        echo WARNING: Greenstone installation is of unknown bitness. "%bitness%" is neither 32 nor 64 bit       
         set bitness=UNKNOWN
     )
@@ -192 +197 @@
 :: https://ss64.com/nt/errorlevel.html
 if DEFINED FOUNDJAVAHOME  (
+    if "%bitness%" == "UNKNOWN" goto setupjavahome
     echo *** Testing bitness of JAVA_HOME found at !FOUNDJAVAHOME!:
     "!FOUNDJAVAHOME!\bin\java.exe" -d%bitness% -version 2> nul
-    if !ERRORLEVEL! equ 1 echo *** The detected JDK java is an incompatible bit architecture& goto testjre  
+    if !ERRORLEVEL! equ 1 echo *** The detected JDK java is incompatible with !bitness! bit GS& goto testjre    
     if !ERRORLEVEL! equ 0 (
         echo *** The detected JDK java is a matching %bitness% bit      
@@ -203 +209 @@
 :testjre
 if DEFINED FOUNDJREHOME  (
+    if "%bitness%" == "UNKNOWN" goto setupjrehome
     echo *** Testing bitness of JRE_HOME found at !FOUNDJREHOME!:
     "!FOUNDJREHOME!\bin\java.exe" -d%bitness% -version 2> nul
-    if !ERRORLEVEL! equ 1 echo *** The detected JRE java is an incompatible bit architecture& goto bundledjre
+    if !ERRORLEVEL! equ 1 echo *** The detected JRE java is incompatible with !bitness! bit GS& goto testbundledjre
     if !ERRORLEVEL! equ 0 ( 
         rem The JRE_HOME found by search4j may be the bundled JRE, overriding any system JRE_HOME,
@@ -215 +222 @@
 
 :: 3. Fall back to 32 bit JRE bundled with GS
+:testbundledjre
+if exist "!BUNDLED_JRE!\bin\java.exe" (
+    if "%bitness%" == "UNKNOWN" goto bundledjre
+    
+    echo *** Testing bitness of bundled JRE at !BUNDLED_JRE!:
+    "!BUNDLED_JRE!\bin\java.exe" -d%bitness% -version 2> nul
+    if !ERRORLEVEL! equ 1 echo *** The detected JRE java is incompatible with !bitness! bit& goto setupjavahome
+    if !ERRORLEVEL! equ 0 ( 
+        echo *** The detected JRE java is a matching %bitness% bit          
+        goto bundledjre
+    )
+)
+
 :bundledjre
 :: We bundled a 32 bit JRE, but what if GS was compiled with 64 bit Java?
 :: All but MG/MGPP and GDBM should still work with 64 bit java.
-if exist "!HINT!\bin\java.exe" (
-  echo *** Changing to use Greenstone's bundled 32-bit jre.
-  set JRE_HOME=!HINT!
-  ::set JAVA_HOME=!HINT!
+if exist "!BUNDLED_JRE!\bin\java.exe" (
+  echo *** Changing to use Greenstone's bundled jre.
+  set JRE_HOME=!BUNDLED_JRE!
+  ::set JAVA_HOME=!BUNDLED_JRE!
   set PATH=!JRE_HOME!\bin;!PATH!
   set RUNJAVA=!JRE_HOME!\bin\java.exe
@@ -247 +267 @@
     goto summaryThenEnd
 )
+
+if exist "!BUNDLED_JRE!\bin\java.exe" goto bundledjre
 
 :: 5. Last ditch effort: search4j couldn't find any java, but check any Java env vars set anyway
@@ -280 +302 @@
 :summaryThenEnd
 :: 6. Check that the bitness of any Java found is appropriate and warn if it is not.
+if "%bitness%" == "UNKNOWN" goto displayvars
 "!RUNJAVA!" -d%bitness% -version 2> nul
 if !ERRORLEVEL! equ 1 (
@@ -291 +314 @@
 )
 
+:displayvars
 echo ********************************************************************
 echo.