svn commit: r664511 - in /ant/ivy/core/trunk: CHANGES.txt build.properties build.xml

[hi...@apache.org]

Author: hibou
Date: Sun Jun  8 08:23:50 2008
New Revision: 664511

URL: http://svn.apache.org/viewvc?rev=664511&view=rev
Log:
Ivy distribution jars contains duplicate entries (IVY-828)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/build.properties
    ant/ivy/core/trunk/build.xml

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=664511&r1=664510&r2=664511&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Jun  8 08:23:50 2008
@@ -83,6 +83,7 @@
 - IMPROVEMENT: Change allownomd and skipbuildwithoutivy into a more semantically correct name (IVY-297)
 - IMPROVEMENT: Smarter determination if an expression is exact or not for RegexpPatternMatcher and GlobPatternMatcher
 
+- FIX: Ivy distribution jars contains duplicate entries (IVY-828)
 - FIX: ivy:report will generate an HTML file that references non-existent ivy-report.css (IVY-826)
 - FIX: dynamic resolveMode not being dynamic on branch (IVY-825)
 - FIX: Filesystem repositories can not have () in the path (IVY-797)

Modified: ant/ivy/core/trunk/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.properties?rev=664511&r1=664510&r2=664511&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.properties (original)
+++ ant/ivy/core/trunk/build.properties Sun Jun  8 08:23:50 2008
@@ -26,6 +26,7 @@
 bootstrap.classes.build.dir=${classes.build.dir}/bootstrap
 ant.classes.build.dir=${classes.build.dir}/ant
 optional.classes.build.dir=${classes.build.dir}/optional
+all.classes.build.dir=${classes.build.dir}/all
 test.build.dir=${basedir}/build/test
 artifacts.build.dir=${basedir}/build/artifact
 distrib.dir=${basedir}/build/distrib

Modified: ant/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=664511&r1=664510&r2=664511&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Sun Jun  8 08:23:50 2008
@@ -105,6 +105,7 @@
     	<mkdir dir="${bootstrap.classes.build.dir}" />
         <mkdir dir="${ant.classes.build.dir}" />
         <mkdir dir="${optional.classes.build.dir}" />
+        <mkdir dir="${all.classes.build.dir}" />
         <mkdir dir="${test.build.dir}" />
         <mkdir dir="${artifacts.build.dir}" />
         <mkdir dir="${test.report.dir}" />
@@ -296,7 +297,12 @@
     		</filterchain>
     	</copy>
 
-        <!-- package the two ivy jars -->
+        <copy todir="${all.classes.build.dir}">
+            <fileset dir="${core.classes.build.dir}" />
+            <fileset dir="${ant.classes.build.dir}" />
+            <fileset dir="${optional.classes.build.dir}" />
+        </copy>
+
         <jar destfile="${artifacts.build.dir}/jars/${final.name}"
                 manifest="${artifacts.build.dir}/MANIFEST.MF">
             <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
@@ -311,9 +317,7 @@
                 <attribute name="Extension-name" value="org.apache.ivy" />
                 <attribute name="Build-Version" value="${build.version}" />
             </manifest>
-            <fileset dir="${core.classes.build.dir}" />
-            <fileset dir="${ant.classes.build.dir}" />
-            <fileset dir="${optional.classes.build.dir}" />
+            <fileset dir="${all.classes.build.dir}" />
         </jar>
     	<!-- copy main jar to ease its use as an OSGi bundle -->
     	<copy file="${artifacts.build.dir}/jars/${final.name}"