Changeset 30574 for main/trunk/gli/gli.bat

Timestamp:

2016-06-16T19:20:23+12:00 (8 years ago)

Author:

ak19

Message:

Improving dispersed GS3: changes to util.pm fix the bug whereby the perl code always write to gs2build\tmp when building, even if the Greenstone folder is not writable. Now the TMP env var location is used and the tmp files get written to TMP\greenstone\web when the GS folder is not writable. Further tidied up bat and cmd files to remove extra variables, to break out of loop reading in build.properties file when the necessary properties are found.

File:

• main/trunk/gli/gli.bat (modified) (1 diff)

main/trunk/gli/gli.bat

@@ -167 +167 @@
 
     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.
-    set USE_TMPDIR_FOR_TOMCAT=
+    rem we need to run the web server in read-only mode. This section of code borrowed from gs3-server.bat. 
     for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 
-        if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H
-    )   
-    if "%USE_TMPDIR_FOR_TOMCAT%" == "true" (
-        set gsdl3_writablehome=%TMP%\greenstone\web
-        set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%"
-        echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%
-        pushd %GSDL3SRCHOME%
-        cmd /c ant.bat %opt_properties% configure-web
-        popd
+        if "%%G"=="gsdl3home.isreadonly" if "%%H" == "true" (
+            set gsdl3_writablehome=%TMP%\greenstone\web
+            :: not used
+            set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%"
+            echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome%
+            pushd %GSDL3SRCHOME%
+            :: passing opt_properties is no longer necessary because ant.bat is unmodified (doesn't make use of it) 
+            :: and because build.xml already contains the properties with the correct values
+            cmd /c ant.bat %opt_properties% configure-web
+            popd
+        )
     )