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

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

Revision: 5859
          http://jython.svn.sourceforge.net/jython/?rev=5859&view=rev
Author:   otmarhumbel
Date:     2009-01-06 21:58:40 +0000 (Tue, 06 Jan 2009)

Log Message:
-----------
- using ${dist.dir} for both jython.jar and jython-complete.jar
- no unjar of jarjar.jar (since it does not exist any more)

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

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-01-06 20:57:41 UTC (rev 5858)
+++ trunk/jython/build.xml	2009-01-06 21:58:40 UTC (rev 5859)
@@ -108,7 +108,7 @@
     <target name="full-build" depends="full-check, install" description="a full build with svn checkout" />
 
     <target name="needed-check" unless="full-build">
-        <uptodate property="antlr.notneeded" targetfile="${dest.dir}/jython.jar">
+        <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar">
             <srcfiles dir="grammar" includes="*.g" />
         </uptodate>
     </target>
@@ -507,7 +507,7 @@
 
     <target name="jar-complete" depends="jar">
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
-        <jarjar destfile="${output.dir}/jython-complete.jar">
+        <jarjar destfile="${dist.dir}/jython-complete.jar">
             <zipfileset src="${dist.dir}/jython.jar"/>
             <zipfileset src="extlibs/antlr-3.1.1-runtime.jar"/>
             <rule pattern="org.antlr.runtime.**" result="org.python.antlr.runtime.@1"/>
@@ -537,11 +537,6 @@
                 </section>
             </manifest>
         </jarjar>
-        <unjar src="${output.dir}/jarjar.jar" dest="${jarjar.dir}">
-            <patternset>
-                <exclude name="META-INF/**"/>
-            </patternset>
-        </unjar>
     </target>
 
     <target name="jar" depends="compile,expose">


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