Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 28263 invoked from network); 16 Aug 2009 02:35:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Aug 2009 02:35:42 -0000 Received: (qmail 67965 invoked by uid 500); 16 Aug 2009 02:35:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 67900 invoked by uid 500); 16 Aug 2009 02:35:47 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 67889 invoked by uid 99); 16 Aug 2009 02:35:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Aug 2009 02:35:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Aug 2009 02:35:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E81BA238888D; Sun, 16 Aug 2009 02:35:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r804551 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.properties.default container/webapps/docs/changelog.xml Date: Sun, 16 Aug 2009 02:35:17 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090816023517.E81BA238888D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kkolinko Date: Sun Aug 16 02:35:17 2009 New Revision: 804551 URL: http://svn.apache.org/viewvc?rev=804551&view=rev Log: Apply https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Update to NSIS 2.45 NSIS 2.45 Release notes: http://sourceforge.net/project/shownotes.php?release_id=688043 Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/build/build.properties.default tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=804551&r1=804550&r2=804551&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Aug 16 02:35:17 2009 @@ -68,16 +68,6 @@ +1: kkolinko -1: -* https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 - Update to NSIS 2.45 - http://svn.apache.org/viewvc?rev=797596&view=rev - +1: kkolinko, rjung, markt - -1: - kkolinko: Now it also requires the following patch, but I hope that - sourceforge.net will fix their error: - http://svn.apache.org/viewvc?rev=797600&view=rev - markt: +1 to the additional change if still required - * Improve build.properties comment in ant build files. Backport from trunk, only the part on build.xml. http://svn.apache.org/viewvc?rev=797425&view=rev Modified: tomcat/tc5.5.x/trunk/build/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=804551&r1=804550&r2=804551&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/build/build.properties.default (original) +++ tomcat/tc5.5.x/trunk/build/build.properties.default Sun Aug 16 02:35:17 2009 @@ -204,12 +204,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.44 +nsis.home=${base.path}/nsis-2.45 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.44.zip +nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip # ----- Struts, version 1.2.4 or later ----- Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=804551&r1=804550&r2=804551&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Aug 16 02:35:17 2009 @@ -46,6 +46,9 @@ install, and allow it to automatically select the correct one for the current platform. (kkolinko/mturk) + + Update Windows installer to use NSIS 2.45. (kkolinko) + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org