Changeset 10646

Timestamp:

2005-09-26T15:45:50+12:00 (18 years ago)

Author:

kjdon

Message:

tidied up this, haven't checked on windows yet :-(

File:

• trunk/gsdl3/gs3-setup.bat (modified) (1 diff)

trunk/gsdl3/gs3-setup.bat

@@ -7 +7 @@
 :start
 :: ---- Set the GSDL3HOME variable to the current directory ----
-cd | winutil\setvar.exe GSDL3HOME > setgsdl3.bat
+cd | winutil\setvar.exe GSDL3SRCHOME > setgsdl3.bat
 call setgsdl3.bat
 del setgsdl3.bat
+echo GSDL3SRCHOME: %GSDL3SRCHOME%
+set GSDL3HOME=%GSDL3SRCHOME%\web
 echo GSDL3HOME: %GSDL3HOME%
+
+:: change if using external tomcat
+set TOMCAT_HOME=%GSDL3SRCHOME%\comms\jakarta\tomcat
 
 :: ---- Set other important environment variables ----
 set GSDLOS=windows
-set PATH=%PATH%;%GSDL3HOME%\bin;%GSDL3HOME%\bin\script;%GSDL3HOME%\lib;%GSDL3HOME%\packages\mysql\bin
+set PATH=%PATH%;%GSDL3SRCHOME%\bin;%GSDL3SRCHOME%\bin\script;%GSDL3SRCHOME%\lib\jni;%GSDL3SRCHOME%\packages\mysql\bin
 
 :: ---- Set the CLASSPATH environment variable ----
-set CLASSPATH=%GSDL3HOME%\resources\java;%GSDL3HOME%\resources\dtd;%GSDL3HOME%\src\java;%GSDL3HOME%\comms\jakarta\tomcat\common\lib\servlet.jar;%GSDL3HOME%\lib\java
-cd %GSDL3HOME%\lib\java
+set CLASSPATH=%GSDL3HOME%\WEB-INF\classes;%CLASSPATH%
 if exist setcp.bat del setcp.bat
-for %%j in (*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%GSDL3HOME%\lib\java\%%j>> setcp.bat
+for %%j in ("%GSDL3HOME%"\WEB_INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%GSDL3HOME%\WEB-INF\lib\%%j>> setcp.bat
+for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH="%%CLASSPATH%%";"%GSDL3SRCHOME%"\lib\jni\%%j>> setcp.bat
+for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH="%%CLASSPATH%%";"%TOMCAT_HOME%\common\endorsed\%%j>> setcp.bat
+
 call setcp.bat
 del setcp.bat
+
 echo CLASSPATH: %CLASSPATH%
 
-cd %GSDL3HOME%
+::cd %GSDL3HOME%
 
 :findJava