Author: markt
Date: Wed Nov 18 12:48:13 2009
New Revision: 881753
URL: http://svn.apache.org/viewvc?rev=881753&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47267
Display release notes correctly in Windows installer
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 18 12:48:13 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683969,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,713953,714002,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,770716,770809,770876,772872,77
6921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831785,831828,831850,831860,832218,835036
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683969,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,713953,714002,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,770716,770809,770876,772872,77
6921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,815972,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831785,831828,831850,831860,832218,833545,835036,835336
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=881753&r1=881752&r2=881753&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 18 12:48:13 2009
@@ -189,33 +189,6 @@
+1: kkolinko
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47267
- http://svn.apache.org/viewvc?rev=817822&view=rev
- http://svn.apache.org/viewvc?rev=833545&view=rev (to address rjung's comment)
- +1: markt, funkman
- +1: kkolinko: only if applied together with r.835336
- -1:
-
- Additional patch:
- http://svn.apache.org/viewvc?rev=835336&view=rev
- +1: kkolinko
- -1:
-
- rjung: Our dreaded multi platform build system is a bit fragile
- w.r.t. fixcrlf. If you change the file to crlf in the installer
- target, then all unix packages (which are build after installer)
- will also contain it in crlf format. Not to bad for especially
- that file (because part of a webapp), but maybe it would
- be cleaner to do this for the installer target only, e.g.
- saving the file, fixcrlf, run nsi, restoring file.
- markt: see second patch
-
- kkolinko: Another way to fix it would be to place a copy of that file
- into %CATALINA_HOME% (with proper CRLF endings) and display that one in
- the installer, leaving the one in the ROOT webapp as is. Note, that we
- already have these two copies of the file in our zip/tgz distributions.
-
* Use correct flag for SSL
http://svn.apache.org/viewvc?rev=831106&view=rev
+1: fhanik, kkolinko, rjung
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=881753&r1=881752&r2=881753&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Nov 18 12:48:13 2009
@@ -281,6 +281,10 @@
<filter token="VERSION_MAJOR" value="${version.major}"/>
<filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+ <!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
+ displayed post-install -->
+ <fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
+ includes="RELEASE-NOTES.txt" eol="crlf" encoding="ISO-8859-1"
fixlast="false" />
<copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true" overwrite="true" encoding="ISO-8859-1" />
<exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
<arg value="/DNSISDIR=${nsis.home}" />
@@ -292,6 +296,10 @@
<arg value="tomcat.nsi" />
</exec>
+ <!-- Restore original line ending-->
+ <fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
+ includes="RELEASE-NOTES.txt" encoding="ISO-8859-1" fixlast="false" />
+
<move file="${tomcat.dist}/tomcat-installer.exe"
tofile="${tomcat.release}/v${version}/bin/${final.name}.exe" />
<checksum file="${tomcat.release}/v${version}/bin/${final.name}.exe"
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=881753&r1=881752&r2=881753&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 18 12:48:13 2009
@@ -503,6 +503,11 @@
<bug>47149</bug>: Build scripts: Explicitly specify encoding when
compiling. (kkolinko)
</fix>
+ <fix>
+ <bug>47267</bug>: Ensure release notes displayed by Windows installer
+ have CRLF line-endings regardless of which OS the install package is
+ built on. (markt/kkolinko)
+ </fix>
<add>
Include NOTICE, LICENSE and manifest files in all Tomcat JARs and add a
mechanism to the build process to enable these files to be customised
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
