Changeset 30568 for main/trunk/greenstone3/gs3-setup.bat

Timestamp:

2016-06-10T22:11:15+12:00 (8 years ago)

Author:

ak19

Message:

All the commits for a distributed GS3 on Windows (no changes made for linux yet). In a distributed GS3, the GS3 is installed in a read-only location and the tomcat runs from the writable TMP area, while the collections go to a writable userweb location specified by the user. (The DVD-only mode still works and is separate.) A problem remains, but exists in the TSG patched version too, and since the current commit breaks nothing, I'm committing it. The user needs to modify 4 properties in build.properties, one of which is new.They need to set using.user.web to true, set web.home to the userweb location, set gsdl3home.isreadonly to true and set gsdl3.writablehome to the tmpdir. The problem is that I can't successfully build the simple html collection if the GS3 installed location is read-only, as the perl code wants to create temporary files in gs2build\tmp which is read-only.

File:

• main/trunk/greenstone3/gs3-setup.bat (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -36 +36 @@
 :: set GSDL3HOME to the 'web' subdirectory
 set GSDL3HOME=!GSDL3SRCHOME!\web
+set TOMCATWEB=!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 
+:: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed
+if exist "!GSDL3SRCHOME!\build.properties" for /F "tokens=1,2 delims==" %%G in (!GSDL3SRCHOME!\build.properties) do ( 
+    if "%%G"=="web.home" (
+        set GSDL3HOME=%%H
+        set GSDL3HOME=!GSDL3HOME:/=\!
+        set TOMCATWEB=!GSDL3HOME!
+        if not exist "!GSDL3HOME!" cmd /c "!GSDL3SRCHOME!\userweb.cmd"
+    )
+)
+
+:: 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
 
 :: change if using external tomcat or ant
@@ -46 +63 @@
 :: ---- Set the CLASSPATH and PATH environment variables ----
 if "!GS_CP_SET!" == "yes" goto skipSetCp
-set CLASSPATH=!GSDL3HOME!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!;
+set CLASSPATH=!TOMCATWEB!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!;
 set PATH=!GSDL3SRCHOME!\bin;!GSDL3SRCHOME!\bin\script;!GSDL3SRCHOME!\lib\jni;!ANT_HOME!\bin;!PATH!