Changeset 31725

Timestamp:

2017-06-09T16:42:06+12:00 (7 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

File:

• main/trunk/gli/gli.bat (modified) (2 diffs)

main/trunk/gli/gli.bat

@@ -163 +163 @@
 
 
-:: Run GS3 if version = 3
-:rungs3
-
+:dispGS3
     rem In a web-dispersed GS3 set up like in the labs, gsdl3home.isreadonly would be true and
     rem we need to run the web server in read-only mode. This section of code borrowed from gs3-server.bat. 
-    for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
+    if "%_VERSION%" == "3" for /F "usebackq tokens=1,2 delims==" %%G in ("%GSDL3SRCHOME%\build.properties") do ( 
         if "%%G"=="gsdl3home.isreadonly" if "%%H" == "true" (
             set gsdl3_writablehome=%TMP%\greenstone\web
@@ -181 +179 @@
         )
     )
-    
+
+:: Run GS3 if version = 3
+:rungs3 
     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
     if ERRORLEVEL 2 (