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

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

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

Log Message:
-----------
make jarjar run all of the time until I figure out why the conditionals
are not working.

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

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-08-08 15:37:43 UTC (rev 5105)
+++ branches/asm/build.xml	2008-08-08 17:42:06 UTC (rev 5106)
@@ -510,7 +510,10 @@
             includesfile="${jython.base.dir}/CoreExposed.includes"/>
     </target>
 
-    <target name="jarjar" depends="init,needed-check" if="jarjar.needed" unless="jarjar.notneeded">
+    <!-- XXX: this should be conditional if="jarjar.needed" or unless="jarjar.notneeded"
+              but I haven't been able to get this to work.  For now always do jarjar
+    -->
+    <target name="jarjar" depends="init,needed-check">
         <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.