remm 01/07/15 23:56:35
Modified: . build.xml tomcat.nsi
Log:
- More tweaks.
- Don't display the README.txt (which contains irrelevant information).
Revision Changes Path
1.27 +0 -1 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 2001/07/15 19:39:06 1.26
+++ build.xml 2001/07/16 06:56:35 1.27
@@ -170,7 +170,6 @@
<fileset dir="resources" />
</copy>
<copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" />
- <copy file="README.txt" tofile="${tomcat.dist}/README.txt" />
<exec dir="${tomcat.dist}" executable="makensis.exe">
<arg value="tomcat.nsi" />
</exec>
1.7 +4 -10 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat.nsi 2001/07/16 02:47:02 1.6
+++ tomcat.nsi 2001/07/16 06:56:35 1.7
@@ -1,6 +1,6 @@
; Tomcat 4 script for Nullsoft Installer
-; $Id: tomcat.nsi,v 1.6 2001/07/16 02:47:02 remm Exp $
+; $Id: tomcat.nsi,v 1.7 2001/07/16 06:56:35 remm Exp $
Name "jakarta-tomcat-4.0"
Caption "Jakarta Tomcat 4.0"
@@ -38,7 +38,6 @@
SetOutPath $INSTDIR
File tomcat.ico
File LICENSE
- File README.txt
File /r bin
File /r common
File /r jasper
@@ -93,12 +92,12 @@
CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Start Tomcat.lnk" \
"$2\bin\java.exe" \
- '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap start' \
+ '-jar -cp "$2\lib\tools.jar" -Dcatalina.home="$INSTDIR"
"$INSTDIR\bin\bootstrap.jar" start' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWNORMAL
CreateShortCut "$SMPROGRAMS\Jakarta Tomcat 4.0\Stop Tomcat.lnk" \
"$2\bin\java.exe" \
- '-cp "$INSTDIR\bin\bootstrap.jar;$2\lib\tools.jar"
-Dcatalina.home="$INSTDIR" org.apache.catalina.startup.Bootstrap stop' \
+ '-Dcatalina.home="$INSTDIR" "$INSTDIR\bin\bootstrap.jar" stop' \
"$INSTDIR\tomcat.ico" 0 SW_SHOWMINIMIZED
SetOutPath "$SMPROGRAMS\Jakarta Tomcat 4.0\Configuration"
@@ -210,11 +209,7 @@
Function .onInstSuccess
- MessageBox MB_YESNO|MB_ICONQUESTION \
- "Setup has completed. View readme file now?" \
- IDNO NoReadme
- ExecShell open '$INSTDIR\README.txt'
- NoReadme:
+ ExecShell open '$SMPROGRAMS\Jakarta Tomcat 4.0'
FunctionEnd
@@ -242,7 +237,6 @@
RMDir /r "$SMPROGRAMS\Jakarta Tomcat 4.0"
Delete "$INSTDIR\tomcat.ico"
Delete "$INSTDIR\LICENSE"
- Delete "$INSTDIR\README.txt"
RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\common"
Delete "$INSTDIR\conf\*.dtd"
