Author: kkolinko Date: Tue Jun 2 23:45:54 2009 New Revision: 781213 URL: http://svn.apache.org/viewvc?rev=781213&view=rev Log: Update to NSIS 2.44
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 2 23:45:54 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,777576 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770876,776924,777576 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=781213&r1=781212&r2=781213&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 2 23:45:54 2009 @@ -107,11 +107,6 @@ +1: kkolinko, markt, funkman -1: -* Update to NSIS 2.44 - http://svn.apache.org/viewvc?rev=776924&view=rev - +1: kkolinko, markt, funkman - -1: - * Build files: Calculate current year automatically by using <tstamp>. http://svn.apache.org/viewvc?rev=776935&view=rev +1: kkolinko, markt,funkman Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=781213&r1=781212&r2=781213&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jun 2 23:45:54 2009 @@ -85,12 +85,12 @@ commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz # ----- NSIS, version 2.0 or later ----- -nsis.home=${base.path}/nsis-2.37 +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.37.zip +nsis.loc=${base-sf.loc}/nsis/nsis-2.44.zip # ----- Commons Daemon, version 1.0-Alpha or later ----- commons-daemon.home=${base.path}/commons-daemon-1.0.1 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=781213&r1=781212&r2=781213&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 2 23:45:54 2009 @@ -28,6 +28,7 @@ <author email="fha...@apache.org">Filip Hanik</author> <author email="rj...@apache.org">Rainer Jung</author> <author email="p...@apache.org">Peter Rossbach</author> + <author email="kkoli...@apache.org">Konstantin Kolinko</author> <title>Changelog</title> </properties> @@ -76,6 +77,9 @@ distributions. Update the Windows installer to automatically use the correct binary on 64-bit machines. (markt) </fix> + <update> + Update to NSIS 2.44 (kkolinko) + </update> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org