Author: kkolinko
Date: Mon Mar 26 01:56:02 2012
New Revision: 1305197
URL: http://svn.apache.org/viewvc?rev=1305197&view=rev
Log:
Merged revision 1305194 from tomcat/trunk:
Review of r1301269
1. Restore *.dll pattern. (Why was it changed? Both variants do work).
2. Let's reference the LICENSE file instead of VERSIONS one. It should always
be there.
I am not sure where VERSIONS file comes from, as I do not see how it is
generated in tc-native 1.1.x sources.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1305194
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1305197&r1=1305196&r2=1305197&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Mar 26 01:56:02 2012
@@ -1538,8 +1538,8 @@
<!-- tc native -->
<copy todir="${tomcat.dist}/bin">
<fileset dir="${tomcat-native.home}/bin">
- <exclude name="*.exe"/>
- <exclude name="*.pdb"/>
+ <include name="*.dll"/>
+ <include name="**/*.dll"/>
</fileset>
</copy>
@@ -2345,7 +2345,7 @@ Apache Tomcat ${version} native binaries
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
<param name="sourcefile.2" value="${tomcat-native.win.2}"/>
- <param name="destfile" value="${tomcat-native.home}/VERSIONS"/>
+ <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
