Author: kkolinko
Date: Sun May 27 14:00:45 2012
New Revision: 1343051
URL: http://svn.apache.org/viewvc?rev=1343051&view=rev
Log:
Improvements to Windows installer:
1. When building a Windows installer do not copy whole "res" folder to
output/dist, but only the files that we need. Make sure that
INSTALLLICENSE file has correct line ends.
2. Remove <code>res/License.rtf</code>. The file that is actually shown
by the Windows installer is <code>res/INSTALLLICENSE</code>.
It is backport of r1231779 of Tomcat 7.
Removed:
tomcat/tc6.0.x/trunk/res/License.rtf
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1343051&r1=1343050&r2=1343051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun May 27 14:00:45 2012
@@ -70,22 +70,6 @@ PATCHES PROPOSED TO BACKPORT:
Or need to delete context.xml manually?
-1:
-* Improvements to Windows installer:
- 1. When building a Windows installer do not copy whole "res" folder to
- output/dist, but only the files that we need. Make sure that
- INSTALLLICENSE file has correct line ends.
- 2. Remove <code>res/License.rtf</code>. The file that is actually shown
- by the Windows installer is <code>res/INSTALLLICENSE</code>.
-
- It is backport of r1231779 of Tomcat 7.
- 1) Execute command:
- svn del res/License.rtf
- 2) Patch
- http://people.apache.org/~kkolinko/patches/2012-01-18_tc6_LicenseRtf.patch
-
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52579
Propose new implementation of ByteChunk.toStringInternal().
This fix does not reintroduce issue BZ51400.
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1343051&r1=1343050&r2=1343051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sun May 27 14:00:45 2012
@@ -308,21 +308,31 @@
description="Create Windows installer" unless="skip.installer">
<echo message="Builds a Windows installer based on Nullsoft Installer"/>
<copy todir="${tomcat.dist}">
- <fileset dir="res" />
+ <fileset dir="res">
+ <include name="INSTALLLICENSE" />
+ <include name="*.bmp" />
+ <include name="*.ico" />
+ <include name="confinstall/**" />
+ </fileset>
+ </copy>
+ <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
overwrite="true" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
</copy>
<copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" />
<copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" />
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE"
eol="crlf" encoding="ISO-8859-1" fixlast="false" />
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1"
fixlast="false" />
- <!-- 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"
overwrite="true" encoding="ISO-8859-1">
- <filterset refid="version.filters"/>
- </copy>
+ <fixcrlf srcdir="${tomcat.dist}" eol="crlf" encoding="ISO-8859-1"
fixlast="false">
+ <include name="*.txt" />
+ <include name="INSTALLLICENSE" />
+ <include name="LICENSE" />
+ <include name="NOTICE" />
+ <include name="tomcat.nsi" />
+ <include name="conf/**" />
+ <!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
+ displayed post-install -->
+ <include name="webapps/ROOT/RELEASE-NOTES.txt" />
+ </fixcrlf>
<exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
<arg value="/DNSISDIR=${nsis.home}" />
<arg value="tomcat.nsi" />
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1343051&r1=1343050&r2=1343051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Sun May 27 14:00:45 2012
@@ -117,6 +117,7 @@ Var ServiceInstallLog
;Install Page order
!insertmacro MUI_PAGE_WELCOME
+ ; Show file named "INSTALLLICENSE"
!insertmacro MUI_PAGE_LICENSE INSTALLLICENSE
; Use custom onLeave function with COMPONENTS page
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE pageComponentsLeave
@@ -133,9 +134,6 @@ Var ServiceInstallLog
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
- ;License dialog
- LicenseData License.rtf
-
;Component-selection page
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container as a Windows service."
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=1343051&r1=1343050&r2=1343051&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 27 14:00:45 2012
@@ -205,6 +205,17 @@
<update>
<bug>52805</bug>: Update to Eclipse JDT Compiler 3.7.2. (kkolinko)
</update>
+ <fix>
+ When building a Windows installer do not copy whole "res" folder to
+ output/dist, but only the files that we need. Apply fixcrlf filter
+ only after the files are copied, so that <code>INSTALLLICENSE</code>
+ file had correct line ends. (kkolinko)
+ </fix>
+ <update>
+ Remove <code>res/License.rtf</code>. The file that is actually shown
+ by the Windows installer is <code>res/INSTALLLICENSE</code>.
+ (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
