Changeset 15363

Timestamp:

2008-05-08T10:07:31+12:00 (16 years ago)

Author:

oranfry

Message:

gs3-setup.bat now sets the CLASSPATH to points to single jar files with a Class-Path manifest field set, rather than listing jars individually. Also, gs3-setup.bat now checks if the PATH has already been modified before modifying it. Also, commented gs3-setup.bat.

Location:

greenstone3/trunk

Files:

• gs3-setup.bat (modified) (1 diff)
• lib/jni/cp.jar (added)
• web/WEB-INF/lib/cp.jar (added)

greenstone3/trunk/gs3-setup.bat

@@ -8 +8 @@
 
 :start
-:: ---- Set the GSDL3HOME variable to the current directory ----
+:: ---- Set some relevant environment variables ----
+
+:: this is the default
+:: greenstone3 (%GSDL3SRCHOME%)
+:: +-- web (%GSDLHOME%)
+:: +-- packages
+::      +-- tomcat (%TOMCAT_HOME%)
+::      +-- ant (%ANT_HOME%)
+
+:: set GSDLSRCHOME to the current directory
 cd | winutil\setvar.exe GSDL3SRCHOME > %TMP%\setgsdl3.bat
 call %TMP%\setgsdl3.bat
 del %TMP%\setgsdl3.bat
+
+:: set GSDLHOME to the 'web' subdirectory
 set GSDL3HOME=%GSDL3SRCHOME%\web
 
-:: change if using external tomcat
+:: change if using external tomcat or ant
 set TOMCAT_HOME=%GSDL3SRCHOME%\packages\tomcat
+set ANT_HOME=%GSDL3SRCHOME%\packages\ant
 
-:: ---- Set other important environment variables ----
+:: other important environment variables
 set GSDLOS=windows
-set ANT_HOME=%GSDL3SRCHOME%\packages\ant
+
+:: ---- Set the CLASSPATH and PATH environment variables ----
+if "%GS_CP_SET%" == "yes" goto skipSetCp
+set CLASSPATH=%CLASSPATH%;.;%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%GSDL3SRCHOME%\server.jar;%GSDL3HOME%\WEB-INF\lib\cp.jar;%GSDL3SRCHOME%\lib\jni\cp.jar;%GSDL3SRCHOME%\build\cp.jar
 set PATH=%PATH%;%GSDL3SRCHOME%\bin;%GSDL3SRCHOME%\bin\script;%GSDL3SRCHOME%\lib\jni;%ANT_HOME%\bin
 
-:: ---- Set the CLASSPATH environment variable ----
-if "%GS_CP_SET%" == "yes" goto skipSetCp
-set CLASSPATH=.;%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%CLASSPATH%
+:: a little dynamic set cp stuff
 if exist %TMP%\setcp.bat del %TMP%\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
-for %%j in ("%GSDL3HOME%"\WEB-INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
 for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
-for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat
-echo set GS_CP_SET=yes >> %TMP%\setcp.bat
-call %TMP%\setcp.bat
-del %TMP%\setcp.bat
+if exist %TMP%\setcp.bat call %TMP%\setcp.bat
+if exist %TMP%\setcp.bat del %TMP%\setcp.bat
+
+set GS_CP_SET=yes
 :skipSetCp
 
+:: ---- Search for java ----
 winutil\search4j.exe -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %TMP%\set_jre_home.bat
 call %TMP%\set_jre_home.bat