Author: nickboldt Date: 2010-05-10 11:46:06 -0400 (Mon, 10 May 2010) New Revision: 21992 Modified: branches/modular_build/build/build.xml Log: tweak windows performance Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-10 15:37:48 UTC (rev 21991) +++ branches/modular_build/build/build.xml 2010-05-10 15:46:06 UTC (rev 21992) @@ -180,40 +180,50 @@ </if> <if> - <available file="${COMMON_TOOLS}/svnant-1.3.0.zip" type="file" /> + <istrue value="${svnant.enabled}" /> <then> - <touch file="${COMMON_TOOLS}/svnant-1.3.0.zip" /> - <mkdir dir="${java.io.tmpdir}/svnant-1.3.0.zip_" /> - <unzip src="${COMMON_TOOLS}/svnant-1.3.0.zip" - dest="${java.io.tmpdir}/svnant-1.3.0.zip_" - overwrite="true" - /> - <copy todir="${COMMON_TOOLS}" failonerror="true"> - <fileset dir="${java.io.tmpdir}/svnant-1.3.0.zip_/svnant-1.3.0/lib/" includes="*.jar" /> - </copy> - <delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" /> - </then> - <elseif> - <or> - <not> - <available file="${COMMON_TOOLS}/svnant.jar" type="file" /> - </not> - <not> - <available file="${COMMON_TOOLS}/svnkit.jar" type="file" /> - </not> - <not> - <available file="${COMMON_TOOLS}/svnClientAdapter.jar" type="file" /> - </not> - </or> - <then> - <fail>Error! + <if> + <available file="${COMMON_TOOLS}/svnant-1.3.0.zip" type="file" /> + <then> + <touch file="${COMMON_TOOLS}/svnant-1.3.0.zip" /> + <mkdir dir="${java.io.tmpdir}/svnant-1.3.0.zip_" /> + <unzip src="${COMMON_TOOLS}/svnant-1.3.0.zip" + dest="${java.io.tmpdir}/svnant-1.3.0.zip_" + overwrite="true" + /> + <copy todir="${COMMON_TOOLS}" failonerror="true"> + <fileset dir="${java.io.tmpdir}/svnant-1.3.0.zip_/svnant-1.3.0/lib/" includes="*.jar" /> + </copy> + <delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" /> + </then> + <elseif> + <or> + <not> + <available file="${COMMON_TOOLS}/svnant.jar" type="file" /> + </not> + <not> + <available file="${COMMON_TOOLS}/svnkit.jar" type="file" /> + </not> + <not> + <available file="${COMMON_TOOLS}/svnClientAdapter.jar" type="file" /> + </not> + </or> + <then> + <fail>Error! Build cannot proceed! Must install svnant.jar, svnkit.jar + svnClientAdapter.jar from ${SVNANT_MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. </fail> - </then> - </elseif> + </then> + </elseif> + </if> + </then> + <else> + <echo level="warning">Warning! +Svnant unavailable. Will use Maven to fetch sources. +</echo> + </else> </if> </target>