Author: nickboldt Date: 2010-05-06 10:54:04 -0400 (Thu, 06 May 2010) New Revision: 21939 Modified: branches/modular_build/build/build.xml Log: support using true/false/other path values of maven.repo.local Modified: branches/modular_build/build/build.xml =================================================================== --- branches/modular_build/build/build.xml 2010-05-06 14:23:43 UTC (rev 21938) +++ branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 21939) @@ -108,7 +108,7 @@ <param name="noXvfb" value="true" /> </antcall> <delete dir="${WORKINGDIR}/purge" includeemptydirs="true" quiet="true" /> - <delete dir="${COMMON_TOOLS}/m2-repository/org/jboss/tools" includeemptydirs="true" quiet="true"/> + <delete dir="${COMMON_TOOLS}/m2-repository/org/jboss/tools" includeemptydirs="true" quiet="true" /> </target> <target name="run" @@ -515,6 +515,30 @@ <echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}</echo> <echo level="verbose">Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo> <property name="MAVEN_DIR" value="${WORKINGDIR}/${COMPONENT}" /> + <!-- support using true/false/other path values of maven.repo.local --> + <if> + <isset property="maven.repo.local" /> + <then> + <if> + <isfalse value="${maven.repo.local}" /> + <then> + <var name="maven.repo.local" value="" /> + </then> + <elseif> + <istrue value="${maven.repo.local}" /> + <then> + <var name="maven.repo.local" value=" -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" /> + </then> + </elseif> + <else> + <var name="maven.repo.local" value=" -Dmaven.repo.local=${maven.repo.local}" /> + </else> + </if> + </then> + <else> + <var name="maven.repo.local" value=" -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" /> + </else> + </if> <!-- 3 hr timeout = 10800000ms --> <exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}" dir="${MAVEN_DIR}" @@ -749,7 +773,8 @@ </if> <var name="zip.contents" unset="true" /> <var name="zip.features" unset="true" /> - <echo level="info"></echo> + <echo level="info"> +</echo> </sequential> </for> </target>