From: mturk <mturk@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Jun 2009 14:53:06 +0000 (+0000)
Subject: Ant doesn't merge two zipfilesets
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9d86974a82e905203ce6bd384c602473503e22d9;p=tomcat7.0

Ant doesn't merge two zipfilesets

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@788043 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/dist.xml b/dist.xml
index a98929ceb..d513238a6 100644
--- a/dist.xml
+++ b/dist.xml
@@ -484,11 +484,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
         <include name="BENCHMARKS.txt"/>
         <exclude name="bin/x64/"/>
         <exclude name="bin/i64/"/>
-        <exclude name="bin/*.dll"/>
-      </zipfileset>
-      <zipfileset dir="${tomcat.dist}/bin" prefix="${final.name}/bin">
-        <include name="*.dll"/>
-        <include name="*.exe"/>
       </zipfileset>
       
     </zip>