From: <fwi...@us...> - 2008-07-11 11:52:57
|
Revision: 4887 http://jython.svn.sourceforge.net/jython/?rev=4887&view=rev Author: fwierzbicki Date: 2008-07-11 04:52:55 -0700 (Fri, 11 Jul 2008) Log Message: ----------- move "not needed" checks into separate task because all such tasks *are* needed during a full build regardless of up to date status of files. Modified Paths: -------------- branches/asm/build.xml Modified: branches/asm/build.xml =================================================================== --- branches/asm/build.xml 2008-07-11 04:05:51 UTC (rev 4886) +++ branches/asm/build.xml 2008-07-11 11:52:55 UTC (rev 4887) @@ -126,6 +126,16 @@ <target name="full-build" depends="full-check, install" description="a full build with svn checkout" /> + <target name="needed-check" unless="full-build"> + <echo message="check needed"/> + <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> + <srcfiles dir="extlibs" includes="*" /> + </uptodate> + <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> + <srcfiles dir="grammar" includes="*.g" /> + </uptodate> + </target> + <target name="init" depends="version-init"> <property name="build.compiler" value="modern" /> <property name="jdk.target.version" value="1.5" /> @@ -183,12 +193,6 @@ <pathelement path="${exposed.dir}" /> <pathelement path="${compile.dir}" /> </path> - <uptodate property="jarjar.notneeded" targetfile="${output.dir}/jarjar.jar"> - <srcfiles dir="extlibs" includes="*" /> - </uptodate> - <uptodate property="antlr.notneeded" targetfile="${dist.dir}/jython.jar"> - <srcfiles dir="grammar" includes="*.g" /> - </uptodate> </target> <target name="version-init"> @@ -432,7 +436,7 @@ lazy="${templates.lazy}"/> </target> - <target name="antlr_gen" depends="init,prepare-output" unless="antlr.notneeded"> + <target name="antlr_gen" depends="init,needed-check,prepare-output" unless="antlr.notneeded"> <java classname="org.antlr.Tool" failonerror="true"> <arg value="-fo"/> <arg path="build/gensrc/org/python/antlr"/> @@ -515,7 +519,8 @@ destdir="${exposed.dir}" includesfile="${jython.base.dir}/CoreExposed.includes"/> </target> - <target name="jarjar" depends="init" > + + <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.1b1.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |