[Jython-checkins] SF.net SVN: jython:[5095] branches/asm/build.xml

[<fwi...@us...>]

Revision: 5095
          http://jython.svn.sourceforge.net/jython/?rev=5095&view=rev
Author:   fwierzbicki
Date:     2008-08-06 18:15:17 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
improved jarjar conditional -- but made build.xml slightly more impenetrable.
Sigh.

Modified Paths:
--------------
    branches/asm/build.xml

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-08-06 17:54:07 UTC (rev 5094)
+++ branches/asm/build.xml	2008-08-06 18:15:17 UTC (rev 5095)
@@ -319,6 +319,8 @@
              want to comment this out, as a clean is really only needed if you change
              the tokens defined in Python.g (and cleans make the build slow) -->
         <antcall target="clean"/>
+        <!-- force jarjar build -->
+        <property name="jarjar.needed" value="true" />
     </target>
 
     <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed,make-output-dirs"/>
@@ -508,7 +510,7 @@
             includesfile="${jython.base.dir}/CoreExposed.includes"/>
     </target>
 
-    <target name="jarjar" depends="init,needed-check" unless="jarjar.notneeded,antlr.notneeded">
+    <target name="jarjar" depends="init,needed-check" if="jarjar.needed" unless="jarjar.notneeded">
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
         <jarjar destfile="${output.dir}/jarjar.jar">
             <zipfileset src="extlibs/antlr-runtime-3.1b2.jar"/>


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