Author: markt
Date: Thu Dec 14 18:33:28 2017
New Revision: 1818179
URL: http://svn.apache.org/viewvc?rev=1818179&view=rev
Log:
The native source bundles (for Commons Daemon and Tomcat Native) are no longer
copied to the bin directory for the deploy target. They are now only copied to
the bin directory for the release target. (markt)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1818179&r1=1818178&r2=1818179&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Dec 14 18:33:28 2017
@@ -1013,11 +1013,6 @@
<target name="deploy"
depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
description="Default. Builds a working Tomcat instance">
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
-
<copy tofile="${tomcat.build}/bin/commons-daemon.jar"
file="${commons-daemon.jar}" />
<!-- Copy scripts -->
@@ -1756,6 +1751,12 @@
</fileset>
</copy>
+ <!-- Source bundles for native components -->
+ <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />
+ <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+ file="${commons-daemon.native.src.tgz}" />
+
<!-- platform README files -->
<echo append="false" file="${tomcat.dist}/bin/x64/README">
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1818179&r1=1818178&r2=1818179&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Dec 14 18:33:28 2017
@@ -128,6 +128,11 @@
Update the internal fork of Commons Codec to r1817136 to pick up some
code clean-up. (markt)
</update>
+ <fix>
+ The native source bundles (for Commons Daemon and Tomcat Native) are no
+ longer copied to the bin directory for the deploy target. They are now
+ only copied to the bin directory for the release target. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
