Author: nickboldt Date: 2010-05-08 12:25:00 -0400 (Sat, 08 May 2010) New Revision: 21973 Modified: branches/modular_build/build/build.xml Log: remove modeshape (test issues?) and implement workaround for 302 redirect issues when building on Windows Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-08 14:54:29 UTC (rev 21972) +++ branches/modular_build/build/build.xml 2010-05-08 16:25:00 UTC (rev 21973) @@ -8,7 +8,7 @@ value="tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + drools,bpel,smooks,freemarker,profiler,portlet; xulrunner,jst,vpe,jsf; esb,tptp,ws; cdi,struts,hibernatetools,seam; @@ -162,15 +162,23 @@ <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 --> <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" - /> + <if> + <available file="${WORKINGDIR}/svnant.jar" type="file" /> + <then> + <copy file="${WORKINGDIR}/svnant.jar" todir="${COMMON_TOOLS}" failonerror="true" /> + </then> + <else> + <!-- ant <get> does not work due to 302/200 redirections --> + <get src="${SVNANT_MIRROR}/svnant-1.3.0.zip" + dest="${COMMON_TOOLS}/svnant-1.3.0.zip" + verbose="true" + usetimestamp="true" + /> + </else> + </if> </then> <else> <exec executable="wget" dir="${COMMON_TOOLS}"> @@ -178,13 +186,31 @@ </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" /> - <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" /> + <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> + <not> + <available file="${COMMON_TOOLS}/svnant.jar" type="file" /> + </not> + <then> + <fail>Error! +Cannot proceed - must install svnant.jar from ${SVNANT_MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. +</fail> + </then> + </elseif> + </if> </target> <target name="get.maven" unless="maven.exists">