Author: heiko.braun(a)jboss.com Date: 2008-04-21 05:52:07 -0400 (Mon, 21 Apr 2008) New Revision: 6561 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml Log: enforce metro rebuild when force.thirdparty.get=true Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-21 09:03:15 UTC (rev 6560) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-21 09:52:07 UTC (rev 6561) @@ -44,7 +44,7 @@ <echo message="checksum.ok=${checksum.ok}"/> </target> - <target name="thirdparty-delete" depends="thirdparty-init" unless="checksum.ok.true"> + <target name="thirdparty-delete" depends="thirdparty-init" if="force.thirdparty.get"> <delete dir="${thirdparty.dir}"/> </target> @@ -170,8 +170,18 @@ </target> <target name="metro-build-required" depends="metro-checkout-dir" if="glassfish.metro.available"> - <available property="metro.build.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/> - <echo message="metro.build.available=${metro.build.available}"/> + <available property="metro.build.is.available" file="${glassfish.metro.dir}/build-marker-${metro.cvs.tag}" type="file"/> + + <condition property="metro.build.available" value="true"> + <and> + <equals arg1="${metro.build.is.available}" arg2="true"/> + <not> + <equals arg1="${force.thirdparty.get}" arg2="true"/> + </not> + </and> + </condition> + + <echo message="*** metro.build.available=${metro.build.available} ***"/> </target> <target name="metro-cvs-build" depends="metro-checkout,metro-build-required" unless="metro.build.available"> @@ -199,7 +209,8 @@ </target> <!-- Copy the metro jars --> - <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" unless="metro.build.available"> + <target name="metro-copy-jars" depends="thirdparty-get,metro-cvs-build,metro-runtime-jar,metro-tools-jar" + unless="metro.build.available"> <mkdir dir="${thirdparty.dir}"/> <property name="lib.runtime.dir" value="${glassfish.metro.dir}/wsit/wsit/lib/runtime"/>