Changeset 30574 for main/trunk/greenstone3

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.

Location:

main/trunk/greenstone3

Files:

• gs3-server.bat (modified) (1 diff)
• gs3-setup.bat (modified) (3 diffs)
• userweb.cmd (modified) (2 diffs)

main/trunk/greenstone3/gs3-server.bat

@@ -53 +53 @@
 
 set GSDL3PATH=
+set USE_TMPDIR_FOR_TOMCAT=
 
 "%RUNJAVA%" -cp "%CLASSPATH%" %opt_properties% org.greenstone.server.Server3 "%GSDL3SRCHOME%"

main/trunk/greenstone3/gs3-setup.bat

@@ -36 +36 @@
 :: set GSDL3HOME to the 'web' subdirectory
 set GSDL3HOME=!GSDL3SRCHOME!\web
-set TOMCATWEB=!GSDL3SRCHOME!\web
+set WEB_CONTAINING_CLASSES=!GSDL3SRCHOME!\web
 :: set GSDL3HOME to any web.home property provided, and create that folder if it doesn't exist
 :: Replace forward slashes in web.home with back slashes 
@@ -44 +44 @@
         set GSDL3HOME=%%H
         set GSDL3HOME=!GSDL3HOME:/=\!
-        set TOMCATWEB=!GSDL3HOME!
+        set WEB_CONTAINING_CLASSES=!GSDL3HOME!      
         if not exist "!GSDL3HOME!" cmd /c "!GSDL3SRCHOME!\userweb.cmd"
-    )
-)
-
+        goto foundwebhome
+    )   
+)
+
+:foundwebhome
 :: Whatever the web directory is, it should contain the WEB-INF\classes folder, else go back to using default for this
 :: The WEB-INF\classes folder will be absent in a userweb folder, but will be present if GSDL3HOME=GSDL3SRCHOME\web
 :: or if web.home points to GS3 as a webapp inside tomcat
-if not exist "!GSDL3HOME!\WEB-INF\classes" set TOMCATWEB=!GSDL3SRCHOME!\web
+if not exist "!GSDL3HOME!\WEB-INF\classes" set WEB_CONTAINING_CLASSES=!GSDL3SRCHOME!\web
 
 :: change if using external tomcat or ant
@@ -63 +65 @@
 :: ---- Set the CLASSPATH and PATH environment variables ----
 if "!GS_CP_SET!" == "yes" goto skipSetCp
-set CLASSPATH=!TOMCATWEB!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!;
+set CLASSPATH=!WEB_CONTAINING_CLASSES!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!;
 set PATH=!GSDL3SRCHOME!\bin;!GSDL3SRCHOME!\bin\script;!GSDL3SRCHOME!\lib\jni;!ANT_HOME!\bin;!PATH!
 

main/trunk/greenstone3/userweb.cmd

@@ -14 +14 @@
 set INSTALLDIR=!GSDL3SRCHOME!
 set USERWEB=
-set IS_TMP_TOMCAT=
 
 :: Loosely based on http://stackoverflow.com/questions/7708681/how-to-read-from-a-properties-file-using-batch-script 
@@ -20 +19 @@
 :: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed
 for /F "tokens=1,2 delims==" %%G in (!GSDL3SRCHOME!\build.properties) do ( 
-    if "%%G"=="web.home" set USERWEB=%%H& set USERWEB=!USERWEB:/=\!
-    if "%%G"=="gsdl3home.isreadonly" set IS_TMP_TOMCAT=%%H
+    if "%%G"=="web.home" set USERWEB=%%H& set USERWEB=!USERWEB:/=\!& goto found 
 )
+
+:found
 echo USERWEB: !USERWEB!
-echo IS_TMP_TOMCAT: !IS_TMP_TOMCAT!
 
 if "!USERWEB!" == "" echo No userweb directory provided & echo. & goto done