Changeset 15148 for greenstone3/trunk/gs3-setup.bat

Timestamp:

2008-03-28T16:14:08+13:00 (16 years ago)

Author:

oranfry

Message:

a few changes to gs3-setup.bat

File:

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

greenstone3/trunk/gs3-setup.bat

@@ -1 +1 @@
 @echo off
 
-if exist machine.bat call machine.bat
+set java_min_version=1.4.0_00
 
 if exist gs3-setup.bat goto start
@@ -19 +19 @@
 :: ---- Set other important environment variables ----
 set GSDLOS=windows
-set PATH=%PATH%;%GSDL3SRCHOME%\bin;%GSDL3SRCHOME%\bin\script;%GSDL3SRCHOME%\lib\jni;
+set ANT_HOME=%GSDL3SRCHOME%\packages\ant
+set PATH=%PATH%;%GSDL3SRCHOME%\bin;%GSDL3SRCHOME%\bin\script;%GSDL3SRCHOME%\lib\jni;%ANT_HOME%\bin
 
 :: ---- Set the CLASSPATH environment variable ----
@@ -30 +31 @@
 for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
 for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat
+echo set GS_CP_SET=yes >> %SystemRoot%\Temp\setcp.bat
 call %SystemRoot%\Temp\setcp.bat
 del %SystemRoot%\Temp\setcp.bat
 :skipSetCp
 
-winutil\launcher.exe -find | winutil\setvar.exe _JRE_HOME > %SystemRoot%\Temp\set_jre_home.bat
+winutil\search4j.exe -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %SystemRoot%\Temp\set_jre_home.bat
 call %SystemRoot%\Temp\set_jre_home.bat
 del %SystemRoot%\Temp\set_jre_home.bat
@@ -46 +48 @@
 echo GSDL3SRCHOME : %GSDL3SRCHOME%
 echo GSDL3HOME    : %GSDL3HOME%
-echo JVM          : %RUNJAVA%
+echo JAVA         : %RUNJAVA%