Author: kkolinko Date: Sun Jan 15 05:11:42 2012 New Revision: 1231625 URL: http://svn.apache.org/viewvc?rev=1231625&view=rev Log: When building a Windows installer apply fixcrlf only after all files has been copied.
The difference is what line ends the INSTALLLICENSE and tomcat.nsi files will have. Some NSIS docs [1] mention that license file must have CRLF line ends. [1] "4.8.1.26 LicenseData" in Scripting Reference, http://nsis.sourceforge.net/Docs/Chapter4.html#4.8.1.26 Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1231625&r1=1231624&r2=1231625&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sun Jan 15 05:11:42 2012 @@ -1683,11 +1683,6 @@ Apache Tomcat ${version} native binaries <target name="installer" description="Create Windows installer" unless="skip.installer" depends="dist-static"> - <fixcrlf srcdir="${tomcat.dist}" eol="crlf" - encoding="ISO-8859-1" fixlast="false" > - <patternset refid="text.files" /> - </fixcrlf> - <echo message="Builds a Windows installer based on Nullsoft Installer"/> <copy todir="${tomcat.dist}"> <fileset dir="res"> @@ -1701,10 +1696,15 @@ Apache Tomcat ${version} native binaries <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> - <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" > + <patternset refid="text.files" /> + </fixcrlf> + <exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows"> <arg value="/DNSISDIR=${nsis.home}" /> <arg value="/V2" /> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org