Show
Ignore:
Timestamp:
16.06.2016 19:20:23 (4 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.bat

    r30568 r30574  
    3636:: set GSDL3HOME to the 'web' subdirectory 
    3737set GSDL3HOME=!GSDL3SRCHOME!\web 
    38 set TOMCATWEB=!GSDL3SRCHOME!\web 
     38set WEB_CONTAINING_CLASSES=!GSDL3SRCHOME!\web 
    3939:: set GSDL3HOME to any web.home property provided, and create that folder if it doesn't exist 
    4040:: Replace forward slashes in web.home with back slashes  
     
    4444        set GSDL3HOME=%%H 
    4545        set GSDL3HOME=!GSDL3HOME:/=\! 
    46         set TOMCATWEB=!GSDL3HOME! 
     46        set WEB_CONTAINING_CLASSES=!GSDL3HOME!       
    4747        if not exist "!GSDL3HOME!" cmd /c "!GSDL3SRCHOME!\userweb.cmd" 
    48     ) 
    49 ) 
    50  
     48        goto foundwebhome 
     49    )    
     50) 
     51 
     52:foundwebhome 
    5153:: Whatever the web directory is, it should contain the WEB-INF\classes folder, else go back to using default for this 
    5254:: The WEB-INF\classes folder will be absent in a userweb folder, but will be present if GSDL3HOME=GSDL3SRCHOME\web 
    5355:: or if web.home points to GS3 as a webapp inside tomcat 
    54 if not exist "!GSDL3HOME!\WEB-INF\classes" set TOMCATWEB=!GSDL3SRCHOME!\web 
     56if not exist "!GSDL3HOME!\WEB-INF\classes" set WEB_CONTAINING_CLASSES=!GSDL3SRCHOME!\web 
    5557 
    5658:: change if using external tomcat or ant 
     
    6365:: ---- Set the CLASSPATH and PATH environment variables ---- 
    6466if "!GS_CP_SET!" == "yes" goto skipSetCp 
    65 set CLASSPATH=!TOMCATWEB!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!; 
     67set CLASSPATH=!WEB_CONTAINING_CLASSES!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!; 
    6668set PATH=!GSDL3SRCHOME!\bin;!GSDL3SRCHOME!\bin\script;!GSDL3SRCHOME!\lib\jni;!ANT_HOME!\bin;!PATH! 
    6769