You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2003/02/16 19:28:48 UTC
cvs commit: jakarta-tomcat-5 build.properties.default build.xml tomcat.nsi
remm 2003/02/16 10:28:48
Modified: . build.properties.default build.xml tomcat.nsi
Log:
- Update to use procrun instead of JavaService.
- Unfortunately, procrun doesn't work as advertised yet.
Revision Changes Path
1.68 +12 -7 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- build.properties.default 12 Feb 2003 17:26:15 -0000 1.67
+++ build.properties.default 16 Feb 2003 18:28:47 -0000 1.68
@@ -67,6 +67,17 @@
commons-launcher.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-launcher/v0.9/commons-launcher-0.9.tar.gz
+# ----- Commons Daemon -----
+commons-daemon.home=${base.path}/commons-daemon
+commons-daemon.lib=${commons-daemon.home}/dist
+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
+commons-daemon.procrun.home=${commons-daemon.home}/src/native/nt/procrun/bin
+commons-daemon.procrun.exe=${commons-daemon.procrun.home}/procrun.exe
+commons-daemon.procrunw.exe=${commons-daemon.procrun.home}/procrunw.exe
+commons-daemon.loc=jakarta-commons-sandbox/daemon
+commons-daemon.cvs.loc=jakarta-commons-sandbox/daemon
+
+
# ----- Commons Digester, version 1.4 or later -----
commons-digester.home=${base.path}/commons-digester-1.4
commons-digester.lib=${commons-digester.home}
@@ -168,12 +179,6 @@
javagroups.lib=${javagroups.home}
javagroups.jar=${javagroups.lib}/javagroups-all.jar
javagroups.loc=http://telia.dl.sourceforge.net/sourceforge/javagroups/JavaGroups-2.0.3.bin.zip
-
-
-# ----- JavaService, version 1.2.0 or later -----
-javaservice.home=${base.path}/javaservice
-javaservice.exe=${javaservice.home}/bin/JavaService.exe
-javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1 or later -----
1.81 +10 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.xml 15 Feb 2003 22:33:23 -0000 1.80
+++ build.xml 16 Feb 2003 18:28:48 -0000 1.81
@@ -42,8 +42,6 @@
<!-- Build Defaults -->
<property name="catalina.build" value="${catalina.home}/build"/>
<property name="jasper.build" value="${jasper.home}/build"/>
- <property name="javaservice.home" value="../javaservice"/>
- <property name="nsis.home" value="c:\program files\nsis"/>
<property name="servlet.home" value="../jakarta-servletapi-5/jsr154/dist"/>
<property name="jsp.home" value="../jakarta-servletapi-5/jsr152/dist"/>
<property name="tomcat.build" value="${basedir}/build"/>
@@ -827,7 +825,8 @@
<fileset dir="resources" />
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
- <copy file="${javaservice.exe}" tofile="${tomcat.dist}/bin/tomcat.exe" />
+ <copy file="${commons-daemon.procrun.exe}" tofile="${tomcat.dist}/bin/tomcat.exe" />
+ <copy file="${commons-daemon.procrunw.exe}" tofile="${tomcat.dist}/bin/tomcatw.exe" />
<filter token="VERSION" value="${version}"/>
<copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true"/>
@@ -907,7 +906,8 @@
<condition property="execute.installer">
<and>
<os family="windows" />
- <available file="${javaservice.exe}" />
+ <available file="${commons-daemon.procrun.exe}" />
+ <available file="${commons-daemon.procrunw.exe}" />
<available file="${nsis.exe}" />
<available file="${nsis.installoptions.dll}" />
</and>
@@ -1063,6 +1063,12 @@
<param name="sourcefile" value="${junit.loc}"/>
<param name="destfile" value="${junit.jar}"/>
<param name="destdir" value="${base.path}"/>
+ </antcall>
+
+ <antcall target="cvsbuild">
+ <param name="location" value="${commons-daemon.cvs.loc}"/>
+ <param name="subdir" value="${commons-daemon.home}"/>
+ <param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
<antcall target="downloadgz">
1.22 +19 -22 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tomcat.nsi 13 Feb 2003 14:45:44 -0000 1.21
+++ tomcat.nsi 16 Feb 2003 18:28:48 -0000 1.22
@@ -111,7 +111,6 @@
File tomcat.ico
File LICENSE
File /r bin
- Delete "$INSTDIR\bin\tomcat.exe"
File /r common
File /r conf
File /r shared
@@ -124,7 +123,8 @@
File /r webapps\ROOT
!insertmacro MUI_INSTALLOPTIONS_READ $2 "jvm.ini" "Field 2" "State"
- CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
+ CopyFiles /SILENT "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
+ ClearErrors
BringToFront
Call configure
@@ -140,11 +140,12 @@
Call findJVMPath
Pop $2
- SetOutPath $INSTDIR\bin
- File /oname=tomcat.exe bin\tomcat.exe
-
- ExecWait '"$INSTDIR\bin\tomcat.exe" -install "Apache Tomcat 5.0" "$2" -Djava.class.path="$INSTDIR\bin\bootstrap.jar" -Dcatalina.home="$INSTDIR" -Djava.endorsed.dirs="$INSTDIR\common\endorsed" -start org.apache.catalina.startup.Bootstrap -params startd -stop org.apache.catalina.startup.Bootstrap -params stopd -out "$INSTDIR\logs\stdout.log" -err "$INSTDIR\logs\stderr.log"'
-
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //IS//Tomcat5 --DisplayName "Apache Tomcat @VERSION@" --Description "Apache Tomcat @VERSION@ Server http://jakarta.apache.org/tomcat" --Install "$INSTDIR\bin\tomcat.exe" --ImagePath "$INSTDIR\bin\bootstrap.jar" --StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass org.apache.catalina.startup.Bootstrap;main;stop --Java auto --JavaOptions -Djava.endorsed.dirs="$INSTDIR\common\endorsed"#-Dcatalina.home="$INSTDIR" --StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log" --WorkingPath "$INSTDIR"'
+
+ ;ExecWait '"$INSTDIR\bin\tomcatw.exe" //US//Tomcat5 --ImagePath "$INSTDIR\bin\bootstrap.jar" --StartupClass org.apache.catalina.startup.Bootstrap;main;start --ShutdownClass org.apache.catalina.startup.Bootstrap;main;stop --Java auto --StdOutputFile "$INSTDIR\logs\stdout.log" --StdErrorFile "$INSTDIR\logs\stderr.log" --WorkingPath "$INSTDIR"'
+
+;--JavaOptions -Djava.endorsed.dirs="$INSTDIR\common\endorsed"#-Dcatalina.home="$INSTDIR"
+
BringToFront
ClearErrors
@@ -216,8 +217,8 @@
SetOverwrite on
SetOutPath $INSTDIR\webapps
- File webapps\jsp-examples.war
- File webapps\servlets-examples.war
+ File /r webapps\jsp-examples
+ File /r webapps\servlets-examples
SectionEnd
@@ -228,8 +229,6 @@
WriteUninstaller "$INSTDIR\Uninstall.exe"
- Call startService
-
WriteRegStr HKLM "SOFTWARE\Apache Group\Tomcat\5.0" "" $INSTDIR
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat 5.0" \
"DisplayName" "Apache Tomcat 5.0 (remove only)"
@@ -293,10 +292,9 @@
ClearErrors
- ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Development Kit" "CurrentVersion"
- ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Development Kit\$2" "JavaHome"
- ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
- ReadRegStr $4 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$3" "RuntimeLib"
+ ReadRegStr $2 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ ReadRegStr $1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "JavaHome"
+ ReadRegStr $3 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$2" "RuntimeLib"
FoundJDK:
@@ -374,7 +372,7 @@
Quit
NoErrors1:
Push $3
- Call findJvmPath
+ Call findJVMPath
Pop $4
StrCmp $4 "" 0 NoErrors2
MessageBox MB_OK "No Java Virtual Machine found."
@@ -478,7 +476,7 @@
Function startService
IfFileExists "$INSTDIR\bin\tomcat.exe" 0 NoService
- ExecWait 'net start "Apache Tomcat 5.0"'
+ ExecWait 'net start "Tomcat5"'
BringToFront
NoService:
@@ -495,7 +493,7 @@
Function un.stopService
IfFileExists "$INSTDIR\bin\tomcat.exe" 0 NoService
- ExecWait 'net stop "Apache Tomcat 5.0"'
+ ExecWait 'net stop "Tomcat5"'
Sleep 1000
BringToFront
@@ -515,7 +513,8 @@
; Stopping NT service (if in use)
Call un.stopService
- ExecWait '"$INSTDIR\bin\tomcat.exe" -uninstall "Apache Tomcat 5.0"'
+ ;ExecWait '"$INSTDIR\bin\tomcat.exe" -uninstall "Apache Tomcat 5.0"'
+ ExecWait '"$INSTDIR\bin\tomcatw.exe" //DS//Tomcat5'
ClearErrors
DeleteRegKey HKCR "JSPFile"
@@ -535,8 +534,6 @@
RMDir /r "$INSTDIR\webapps\tomcat-docs"
RMDir /r "$INSTDIR\webapps\servlets-examples"
RMDir /r "$INSTDIR\webapps\jsp-examples"
- Delete "$INSTDIR\webapps\servlets-examples.war"
- Delete "$INSTDIR\webapps\jsp-examples.war"
RMDir "$INSTDIR\webapps"
RMDir /r "$INSTDIR\work"
RMDir /r "$INSTDIR\temp"
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org