Changeset 22075 for main/trunk

Timestamp:

2010-05-11T17:16:58+12:00 (14 years ago)

Author:

ak19

Message:

Needed to gs3-setup.bat working again since gs3-server.bat wasn't working when there were spaces in the GS3 filepath: 1. global variables declared in gs3-setup.bat needed to be exported after endlocal in the same line as endlocal. 2. The setting of the classpath was broken when there spaces in the paths and didn't include the full path to included jars.

File:

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

main/trunk/greenstone3/gs3-setup.bat

@@ -46 +46 @@
 
 :: a little dynamic set cp stuff
-if exist !TMP!\setcp.bat del !TMP!\setcp.bat
-for %%j in (!TOMCAT_HOME!\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> !TMP!\setcp.bat
-for %%j in (!TOMCAT_HOME!\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> !TMP!\setcp.bat
+if exist "!TMP!\setcp.bat" del "!TMP!\setcp.bat"
+
+:: http://ss64.com/nt/for_cmd.html, how to deal with spaces in the file list in a for command
+:: Note that TOMCAT_HOME\common\endorsed only exists for Tomcat 5, not Tomcat 6
+:: (where it contains xercesImpl.jar and xml-apis.jar which aren't there in Tomcat 6)
+if exist "!TOMCAT_HOME!\common\endorsed\*.jar" for /f %%j in ('dir/b ^"!TOMCAT_HOME!\common\endorsed\*.jar^"') do echo set CLASSPATH=%%CLASSPATH%%;%%TOMCAT_HOME%%\common\endorsed\%%j>> !TMP!\setcp.bat
+for /f %%j in ('dir/b ^"!TOMCAT_HOME!\lib\*.jar^"') do echo set CLASSPATH=%%CLASSPATH%%;%%TOMCAT_HOME%%\lib\%%j>> !TMP!\setcp.bat
+
 if exist !TMP!\setcp.bat call !TMP!\setcp.bat
 if exist !TMP!\setcp.bat del !TMP!\setcp.bat
@@ -144 +149 @@
 echo GSDL3HOME    : !GSDL3HOME!
 echo JAVA         : !RUNJAVA!
+
 if "!ANT_HOME!" == "" (
    echo.
@@ -149 +155 @@
    echo Please make sure you have Ant version 1.7.1 or higher installed
    echo Then set ANT_HOME to the ant installation folder
-   echo and add the path to its bin folder to the PATH
+   echo and add the path to its bin folder to the PATH environment variable
 ) else (
    echo ANT_HOME     : !ANT_HOME!
@@ -158 +164 @@
 :: Restore global variables that would otherwise be lost at script's end due to their having been initialised in a 
 :: set local/set enabledelayedexpansion section. See http://ss64.com/nt/endlocal.html
-endlocal & set RUNJAVA=%RUNJAVA%
-
-set PATH=%PATH%
-set GSDL3HOME=%GSDL3HOME%
-set GSDL3SRCHOME=%GSDL3SRCHOME%
-set JAVA_HOME=%JAVA_HOME%
-set JRE_HOME=%JRE_HOME%
-set ANT_HOME=%ANT_HOME%
-set RUNJAVA=%RUNJAVA%
+endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH%
 
 :end