Author: nickboldt Date: 2010-05-06 11:03:07 -0400 (Thu, 06 May 2010) New Revision: 21940 Modified: branches/modular_build/build/build.xml Log: workaround for windows and svnant server suck Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 21939) +++ branches/modular_build/build/build.xml 2010-05-06 15:03:07 UTC (rev 21940) @@ -163,9 +163,21 @@ <target name="get.svnant" unless="svnant.jar.exists"> <property name="SVNANT_MIRROR" value="http://www.tigris.org/files/documents/906/46267" /> <!-- ant <get> does not work due to redirection; on Windows just download this file manually --> - <exec executable="wget" dir="${COMMON_TOOLS}"> - <arg line="${SVNANT_MIRROR}/svnant-1.3.0.zip --no-clobber" /> - </exec> + <if> + <os family="windows" /> + <then> + <get src="${SVNANT_MIRROR}/svnant-1.3.0.zip" + dest="${COMMON_TOOLS}/svnant-1.3.0.zip" + verbose="true" + usetimestamp="true" + /> + </then> + <else> + <exec executable="wget" dir="${COMMON_TOOLS}"> + <arg line="${SVNANT_MIRROR}/svnant-1.3.0.zip --no-clobber" /> + </exec> + </else> + </if> <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" /> @@ -774,7 +786,7 @@ <var name="zip.contents" unset="true" /> <var name="zip.features" unset="true" /> <echo level="info"> -</echo> + </echo> </sequential> </for> </target>