Changeset 34258

Timestamp:

2020-07-10T13:49:33+12:00 (4 years ago)

Author:

ak19

Message:

Added code to allow running standalone client-gli with a packages\windows\jre subfolder and bin\search4j folder. However as a jre is some 110MB, may decide not to distribute a standalone client-gli distribution with a jre, let alone a jre for each OS.

Location:

main/trunk/gli

Files:

• client-gli.bat (modified) (1 diff)
• findjava.bat (modified) (1 diff)

main/trunk/gli/client-gli.bat

@@ -47 +47 @@
 :: will have to be done remotely anyway. If Perl is found, PERLPATH will be set.
 call findgsdl.bat
-if "%GSDLHOME%" == "" goto findJava
+if "%GSDLHOME%" == "" ( 
+    set GLIHOME=!CD!
+    echo @@@ Running standalone client. GLIHOME set to: !GLIHOME!   
+    goto findJava
+) else (
     call findperl.bat
+)
 
 :findJava

main/trunk/gli/findjava.bat

@@ -19 +19 @@
 set SEARCH4J_EXECUTABLE=search4j.exe
 if exist %SEARCH4J_EXECUTABLE% goto setJexec
-if "%_VERSION%" == "" goto tryJava
+if "%_VERSION%" == "" goto tryJava  
+    :: _version ends up being 1 instead of empty when GLIHOME is set
+    :: If GLIHOME is set, we may have search4j and jre for several OS
+    :: Since this is a Windows batch file, set up the windows search4j and especially jre
+    if "%_VERSION%" == "1" if not "%GLIHOME%" == "" (
+        rem echo @@@ Running standalone client-GLI. Using glihome=!GLIHOME!
+        set SEARCH4J_EXECUTABLE=!GLIHOME!\bin\windows\search4j.exe
+        set HINT=!GLIHOME!\packages\windows\jre
+    )
     :: else we look for a compiled version of search4j in a GS installation
     if "%_VERSION%" == "2" (