Author: kkolinko
Date: Sun Jun 14 15:01:28 2009
New Revision: 784569
URL: http://svn.apache.org/viewvc?rev=784569&view=rev
Log:
Fix download task for NSIS so that it installs what it downloads,
instead of just downloading an exe installer.
This is partial backport of rev.673614
Also, update to NSIS 2.44
Modified:
tomcat/build/tc5.5.x/build.properties.default
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?rev=784569&r1=784568&r2=784569&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Sun Jun 14 15:01:28 2009
@@ -202,12 +202,12 @@
rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.34
+nsis.home=${base.path}/nsis-2.44
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.34-setup.exe
+nsis.loc=${base-sf.loc}/nsis/nsis-2.44.zip
# ----- Struts, version 1.2.4 or later -----
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=784569&r1=784568&r2=784569&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Sun Jun 14 15:01:28 2009
@@ -1961,10 +1961,10 @@
<param name="destfile" value="${commons-launcher.jar}"/>
</antcall>
- <antcall target="downloadfile">
+ <antcall target="downloadzip">
<param name="sourcefile" value="${nsis.loc}"/>
<param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}"/>
+ <param name="destdir" value="${nsis.home}/.."/>
</antcall>
<antcall target="downloadgz">
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=784569&r1=784568&r2=784569&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Jun 14 15:01:28 2009
@@ -27,6 +27,7 @@
<author email="yo...@apache.org">Yoav Shapira</author>
<author email="fha...@apache.org">Filip Hanik</author>
<author email="p...@apache.org">Peter Rossbach</author>
+ <author email="kkoli...@apache.org">Konstantin Kolinko</author>
<title>Changelog</title>
</properties>
@@ -38,6 +39,9 @@
<bug>45880</bug>: Include NOTICE file in Windows installer and make
sure
src files are excluded. (markt)
</fix>
+ <update>
+ Update to NSIS 2.44 (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=784569&r1=784568&r2=784569&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Sun Jun 14 15:01:28 2009
@@ -126,14 +126,6 @@
-* Fix download task for NSIS so that it installs what it downloads,
- instead of just downloading an exe installer.
- This is partial backport of
http://svn.apache.org/viewvc?view=rev&revision=673614
- Also, update to NSIS 2.44
-
http://people.apache.org/~kkolinko/patches/2009-06-03_nsis-download-tc55.patch
- +1: kkolinko, fhanik, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37084
https://issues.apache.org/bugzilla/attachment.cgi?id=23807
Port of fix for 46471 that also fixes this JspC compilation issue
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
