From: <cg...@us...> - 2008-11-09 20:15:19
|
Revision: 5559 http://jython.svn.sourceforge.net/jython/?rev=5559&view=rev Author: cgroves Date: 2008-11-09 20:15:15 +0000 (Sun, 09 Nov 2008) Log Message: ----------- Force jarjar to run if antlr is going to do a clean. This was causing the build to get into a weird state requiring a clean if local compilation failed after antlr changed. Modified Paths: -------------- trunk/jython/build.xml Modified: trunk/jython/build.xml =================================================================== --- trunk/jython/build.xml 2008-11-09 19:46:24 UTC (rev 5558) +++ trunk/jython/build.xml 2008-11-09 20:15:15 UTC (rev 5559) @@ -109,13 +109,20 @@ <target name="full-build" depends="full-check, install" description="a full build with svn checkout" /> <target name="needed-check" unless="full-build"> - <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> - <srcfiles dir="extlibs" includes="*" /> + <uptodate property="antlr.notneeded" targetfile="${output.dir}/jarjar.jar"> <srcfiles dir="grammar" includes="*.g" /> </uptodate> - <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> - <srcfiles dir="grammar" includes="*.g" /> - </uptodate> + <!-- When antlr.notneeded isn't set, a clean is run after this, so jarjar's running depends + on both that and its own jar --> + <condition property="jarjar.notneeded"> + <and> + <isset property="antlr.notneeded"/> + <uptodate targetfile="${output.dir}/jarjar.jar"> + <srcfiles dir="extlibs" includes="*" /> + <srcfiles dir="grammar" includes="*.g" /> + </uptodate> + </and> + </condition> </target> <target name="init" depends="version-init"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |