[Jython-checkins] SF.net SVN: jython:[5308] trunk/jython/build.xml

[<otm...@us...>]

Revision: 5308
          http://jython.svn.sourceforge.net/jython/?rev=5308&view=rev
Author:   otmarhumbel
Date:     2008-09-09 22:34:55 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
applied leosoto's patch from http://bugs.jython.org/issue1077 to avoid duplicate entries in jython-complete.jar

Modified Paths:
--------------
    trunk/jython/build.xml

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-09-09 21:15:54 UTC (rev 5307)
+++ trunk/jython/build.xml	2008-09-09 22:34:55 UTC (rev 5308)
@@ -533,9 +533,9 @@
     </target>
 
     <target name="jar-complete" depends="compile,expose,jarjar">
-       <jar destfile="${dist.dir}/jython-complete.jar">
+       <jar destfile="${dist.dir}/jython-complete.jar" duplicate="preserve">
+          <fileset dir="${exposed.dir}"/>
           <fileset dir="${compile.dir}"/>   
-          <fileset dir="${exposed.dir}"/>
           <fileset dir="${jarjar.dir}">
           </fileset>
           <manifest>
@@ -557,9 +557,9 @@
     </target>
 
     <target name="jar" depends="compile,expose,jarjar">
-       <jar destfile="${dist.dir}/jython.jar">
+       <jar destfile="${dist.dir}/jython.jar" duplicate="preserve">
+          <fileset dir="${exposed.dir}"/>
           <fileset dir="${compile.dir}"/>   
-          <fileset dir="${exposed.dir}"/>
           <fileset dir="${jarjar.dir}">
               <include name="org/python/objectweb/asm/ClassReader.class" />
           </fileset>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.