Author: nickboldt Date: 2010-05-08 14:26:19 -0400 (Sat, 08 May 2010) New Revision: 21979 Removed: branches/modular_build/build/svnClientAdapter.jar branches/modular_build/build/svnant.README.txt branches/modular_build/build/svnant.jar branches/modular_build/build/svnkit.jar Modified: branches/modular_build/build/build.xml Log: better error reporting; no longer need svnant/svnkit (fallback to mvn scm plugin for svn fetch) Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 18:22:50 UTC (rev 21978) +++ branches/modular_build/build/build.xml 2010-05-08 18:26:19 UTC (rev 21979) @@ -176,7 +176,7 @@ </exec> </else> </if> - + <if> <available file="${COMMON_TOOLS}/svnant-1.3.0.zip" type="file" /> <then> @@ -192,12 +192,23 @@ <delete dir="${java.io.tmpdir}/svnant-1.3.0.zip_" includeemptydirs="true" quiet="true" /> </then> <elseif> - <not> - <available file="${COMMON_TOOLS}/svnant.jar" type="file" /> - </not> + <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 + other jars from ${SVNANT_MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. +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> Deleted: branches/modular_build/build/svnClientAdapter.jar =================================================================== (Binary files differ) Deleted: branches/modular_build/build/svnant.README.txt =================================================================== --- branches/modular_build/build/svnant.README.txt 2010-05-08 18:22:50 UTC (rev 21978) +++ branches/modular_build/build/svnant.README.txt 2010-05-08 18:26:19 UTC (rev 21979) @@ -1,2 +0,0 @@ -svnant.jar, svnClientAdapter.jar, and svnkit.jar fetched from http://www.tigris.org/files/documents/906/46267/svnant-1.3.0.zip -Cannot simply fetch file using <get> because Ant get stuck in infinite redirection loop (200 -> 302 -> 200 -> ...) Deleted: branches/modular_build/build/svnant.jar =================================================================== (Binary files differ) Deleted: branches/modular_build/build/svnkit.jar =================================================================== (Binary files differ)