Changeset 34258

Show
Ignore:
Timestamp:
10.07.2020 13:49:33 (4 weeks 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/client-gli.bat

    r31649 r34258  
    4747:: will have to be done remotely anyway. If Perl is found, PERLPATH will be set. 
    4848call findgsdl.bat 
    49 if "%GSDLHOME%" == "" goto findJava 
     49if "%GSDLHOME%" == "" (  
     50    set GLIHOME=!CD! 
     51    echo @@@ Running standalone client. GLIHOME set to: !GLIHOME!    
     52    goto findJava 
     53) else ( 
    5054    call findperl.bat 
     55) 
    5156 
    5257:findJava 
  • main/trunk/gli/findjava.bat

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