Changeset 31725

Show
Ignore:
Timestamp:
09.06.2017 16:42:06 (2 years ago)
Author:
ak19
Message:

The path to using build.properties is now conditional, so we don't do it when launching GLI for GS2

Files:
1 modified

Legend:

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

    r31649 r31725  
    163163 
    164164 
    165 :: Run GS3 if version = 3 
    166 :rungs3 
    167  
     165:dispGS3 
    168166    rem In a web-dispersed GS3 set up like in the labs, gsdl3home.isreadonly would be true and 
    169167    rem we need to run the web server in read-only mode. This section of code borrowed from gs3-server.bat.  
    170     for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do (  
     168    if "%_VERSION%" == "3" for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do (  
    171169        if "%%G"=="gsdl3home.isreadonly" if "%%H" == "true" ( 
    172170            set gsdl3_writablehome=%TMP%\greenstone\web 
     
    181179        ) 
    182180    ) 
    183      
     181 
     182:: Run GS3 if version = 3 
     183:rungs3  
    184184    if "%_VERSION%" == "3" "%JAVA_EXECUTABLE%" -cp classes/;GLI.jar;lib/apache.jar;lib/jna.jar;lib/jna-platform.jar;lib/qfslib.jar;lib/rsyntaxtextarea.jar org.greenstone.gatherer.GathererProg -gsdl "%GSDLHOME%" -gsdlos %GSDLOS% -gsdl3 "%GSDL3HOME%" -gsdl3src "%GSDL3SRCHOME%" -perl "%PERLPATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9 
    185185    if ERRORLEVEL 2 (