remm 01/12/19 09:02:26
Modified: . build.xml tomcat.nsi
Log:
- Upgrade to NSIS 1.91.
- Use new bz2 compression mode for a dramatic reduction in the size of the
installer (it contains source + binaries, and it's smaller than the binary only
.tar.gz), which is now less than 5M.
Revision Changes Path
1.53 +2 -2 jakarta-tomcat-4.0/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/build.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- build.xml 2001/11/21 18:24:05 1.52
+++ build.xml 2001/12/19 17:02:26 1.53
@@ -224,7 +224,7 @@
<copy file="${javaservice.home}/bin/JavaService.exe"
tofile="${tomcat.dist}/bin/tomcat.exe" />
<copy file="tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi" />
- <exec dir="${tomcat.dist}" executable="${nsis.home}\makensis.exe">
+ <exec dir="${tomcat.dist}" executable="${nsis.home}\makensis-bz2.exe">
<arg value="tomcat.nsi" />
</exec>
<move file="${tomcat.dist}/tomcat4.exe"
@@ -272,7 +272,7 @@
<and>
<os family="windows" />
<available file="${javaservice.home}/bin/JavaService.exe" />
- <available file="${nsis.home}\makensis.exe" />
+ <available file="${nsis.home}\makensis-bz2.exe" />
</and>
</condition>
</target>
1.22 +3 -41 jakarta-tomcat-4.0/tomcat.nsi
Index: tomcat.nsi
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tomcat.nsi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tomcat.nsi 2001/11/21 21:04:52 1.21
+++ tomcat.nsi 2001/12/19 17:02:26 1.22
@@ -1,6 +1,6 @@
; Tomcat 4 script for Nullsoft Installer
-; $Id: tomcat.nsi,v 1.21 2001/11/21 21:04:52 remm Exp $
+; $Id: tomcat.nsi,v 1.22 2001/12/19 17:02:26 remm Exp $
Name "apache-tomcat-4.1"
Caption "Apache Tomcat 4.1"
@@ -55,6 +55,8 @@
CopyFiles "$2\lib\tools.jar" "$INSTDIR\common\lib" 4500
+ WriteUninstaller uninst-tomcat4.exe
+
SectionEnd
Section "NT Service (NT/2k/XP only)"
@@ -297,47 +299,7 @@
FunctionEnd
-; =================
-; DoUpdate Function
-; =================
-;
-Function doUpdate
-
- ; This function will be called if a previous Tomcat 4.1 installation has been
- ; found
-
- ReadRegStr $1 HKLM "SOFTWARE\Apache\Apache Tomcat 4.1" ""
- IfErrors NoUpdate
-
- MessageBox MB_YESNO|MB_ICONQUESTION \
- "A previous installation of Jakarata Tomcat 4.1 has been found in $1.\
- Do you want to upgrade it to the latest version ?" IDNO NoUpdate
-
- SetOverwrite ifnewer
- SetOutPath $INSTDIR
- File tomcat.ico
- File LICENSE
- File /r bin
- File /r common
- File /r shared
- File /r logs
- File /r server
- File /r work
- SetOutPath $INSTDIR\webapps
- File /r webapps\ROOT
-
- MessageBox MB_OK "Update was successful."
-
- ; Installation over
- Abort
-
-NoUpdate:
-
-FunctionEnd
-
-
UninstallText "This will uninstall Apache Tomcat 4.1 from your system:"
-UninstallExeName uninst-tomcat4.exe
Section Uninstall
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
