Alternative patch

bug48990-patch.txt (text/plain), 3.10 KB, created by Mark Thomas on 2010-05-24 13:26:19 UTC

(hide)

Description: Alternative patch

Filename:

MIME Type:

Creator: Mark Thomas

Created: 2010-05-24 13:26:19 UTC

Size: 3.10 KB

patch

obsolete

>Index: dist.xml >=================================================================== >--- dist.xml (revision 947713) >+++ dist.xml (working copy) >@@ -210,6 +210,28 @@ > > <touch file="${tomcat.dist}/temp/safeToDelete.tmp" /> > >+ <!-- Windows binaries for each platform --> >+ <!-- 32 bit --> >+ <copy file="${commons-daemon.home}/windows/prunsrv.exe" >+ tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" /> >+ <copy file="${commons-daemon.home}/windows/prunmgr.exe" >+ tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" /> >+ <!-- 64 bit amd --> >+ <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe" >+ tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" /> >+ <!-- 64 bit ia --> >+ <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe" >+ tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> >+ <!-- tc native --> >+ <copy file="${tomcat-native.home}/tcnative-1.dll.x86" >+ tofile="${tomcat.dist}/bin/tcnative-1.dll" /> >+ <!-- tc native 64 bit for amd/emt --> >+ <copy file="${tomcat-native.home}/tcnative-1.dll.x64" >+ tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" /> >+ <!-- tc native 64 bit for ia --> >+ <copy file="${tomcat-native.home}/tcnative-1.dll.i64" >+ tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" /> >+ > <!-- Correct permissions and line endings on "bin" scripts --> > <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf" encoding="ISO-8859-1" fixlast="false" /> > <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf" encoding="ISO-8859-1" fixlast="false" /> >@@ -305,26 +327,6 @@ > <copy file="${nsis.installoptions.dll}" todir="${tomcat.dist}" /> > <copy file="${nsis.nsexec.dll}" todir="${tomcat.dist}" /> > <copy file="${nsis.nsisdl.dll}" todir="${tomcat.dist}" /> >- <!-- 32 bit --> >- <copy file="${commons-daemon.home}/windows/prunsrv.exe" >- tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" /> >- <copy file="${commons-daemon.home}/windows/prunmgr.exe" >- tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" /> >- <!-- 64 bit amd --> >- <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe" >- tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" /> >- <!-- 64 bit ia --> >- <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe" >- tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" /> >- <!-- tc native --> >- <copy file="${tomcat-native.home}/tcnative-1.dll.x86" >- tofile="${tomcat.dist}/bin/tcnative-1.dll" /> >- <!-- tc native 64 bit for amd/emt --> >- <copy file="${tomcat-native.home}/tcnative-1.dll.x64" >- tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" /> >- <!-- tc native 64 bit for ia --> >- <copy file="${tomcat-native.home}/tcnative-1.dll.i64" >- tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" /> > > <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" /> View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]