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

[<cg...@us...>]

Revision: 5389
          http://jython.svn.sourceforge.net/jython/?rev=5389&view=rev
Author:   cgroves
Date:     2008-10-14 01:47:30 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
Jarjar if antlr changed more recently than the jarjar'd jar.  Jar.

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

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2008-10-13 20:38:36 UTC (rev 5388)
+++ trunk/jython/build.xml	2008-10-14 01:47:30 UTC (rev 5389)
@@ -111,6 +111,7 @@
     <target name="needed-check" unless="full-build">
         <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar">
             <srcfiles dir="extlibs" includes="*" />
+            <srcfiles dir="grammar" includes="*.g" />
         </uptodate>
         <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar">
             <srcfiles dir="grammar" includes="*.g" />
@@ -316,14 +317,10 @@
              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"/>
-
+    
     <!-- create output directories -->
-    <target name ="make-output-dirs" depends="init">
+    <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed">
         <mkdir dir="${compile.dir}" />
         <mkdir dir="${jarjar.dir}" />
         <mkdir dir="${gensrc.dir}/org/python/antlr" />
@@ -506,10 +503,7 @@
             includesfile="${jython.base.dir}/CoreExposed.includes"/>
     </target>
 
-    <!-- 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">
+    <target name="jarjar" depends="init,needed-check" 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.1.jar"/>


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