Author: markt
Date: Sun Jun 6 23:46:22 2010
New Revision: 952023
URL: http://svn.apache.org/viewvc?rev=952023&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990
Fix the skip.installer build property so once set, the Windows installer is
skipped but all the other artifacts are created
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
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=952023&r1=952022&r2=952023&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jun 6 23:46:22 2010
@@ -140,13 +140,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, rjung
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48990
- Fix the skip.installer build property so once set, the Windows installer is
- skipped but all the other artifacts are created
- https://issues.apache.org/bugzilla/attachment.cgi?id=25477&action=edit
- +1: markt, kkolinko, rjung
- -1:
-
* Fix issues running AJP BIO coyote connector under a security manager
http://svn.apache.org/viewvc?rev=947717&view=rev (less changes to
loadUtilPackage())
+1: markt, kkolinko, rjung
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=952023&r1=952022&r2=952023&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Sun Jun 6 23:46:22 2010
@@ -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" />
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=952023&r1=952022&r2=952023&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jun 6 23:46:22 2010
@@ -270,6 +270,10 @@
<fix>
Remove unused code from org.apache.tomcat.util.buf classes. (kkolinko)
</fix>
+ <fix>
+ Fix the skip.installer build property so if set, only the Windows
+ installer is skipped. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
