Mercurial > public > develkit
diff ivy-ant.xml @ 66:a85308f02ef4
update clean targets to handle user ivy in different location
author | smith@nwoca.org |
---|---|
date | Fri, 14 Oct 2011 08:35:40 -0400 |
parents | 880f230dd947 |
children | bd192b070501 |
line wrap: on
line diff
--- a/ivy-ant.xml Thu Oct 13 15:47:43 2011 -0400 +++ b/ivy-ant.xml Fri Oct 14 08:35:40 2011 -0400 @@ -13,12 +13,14 @@ <property name="ivy-ant.location" location="${ant.file.ivy-ant}"/> <dirname property="ivy-ant.base" file="${ivy-ant.location}"/> + <property name="ivy.default.ivy.user.dir" + value="${user.home}/.ivy2"/> <property name="ivy.default.cache.dir" - value="${user.home}/.ivy2/cache"/> + value="${ivy.default.ivy.user.dir}/cache"/> <property name="ivy.default.ivy.user.dir" - value="${user.home}/.ivy2"/> + value="${ivy.default.ivy.user.dir}/.ivy2"/> <property name="ivy.local.default.root" - value="${user.home}/.ivy2/local"/> + value="${ivy.default.ivy.user.dir}/.ivy2/local"/> <ssdt:fetch dest="${ssdt.devel.kit}/ssdt.default.ivy.settings.xml" src="${ssdt.ivy.settings.src}"/> @@ -35,20 +37,20 @@ </target> <target name="ivy-clean-all" description="cleans ssdt caches and local builds" depends="init"> - <delete failonerror="false" includeemptydirs="true" dir="${user.home}/.ivy2"/> + <delete failonerror="false" includeemptydirs="true" dir="${ivy.default.ivy.user.dir}"/> </target> <target name="ivy-clean" description="cleans ssdt caches and local builds" depends="init"> <delete failonerror="false" includeemptydirs="true"> - <fileset dir="${user.home}/.ivy2/cache"> + <fileset dir="${ivy.default.ivy.user.dir}/cache"> <include name="*ssdt*.*"/> </fileset> </delete> - <delete dir="${user.home}/.ivy2/cache/org.ssdt_ohio" failonerror="false"/> - <delete dir="${user.home}/.ivy2/cache/org.nwoca.ssdt" failonerror="false"/> - <delete dir="${user.home}/.ivy2/ssdt-cache" failonerror="false"/> - <delete dir="${user.home}/.ivy2/snapshot-cache" failonerror="false"/> - <delete dir="${user.home}/.ivy2/local" failonerror="false"/> + <delete dir="${ivy.default.ivy.user.dir}/cache/org.ssdt_ohio" failonerror="false"/> + <delete dir="${ivy.default.ivy.user.dir}/cache/org.nwoca.ssdt" failonerror="false"/> + <delete dir="${ivy.default.ivy.user.dir}/ssdt-cache" failonerror="false"/> + <delete dir="${ivy.default.ivy.user.dir}/snapshot-cache" failonerror="false"/> + <delete dir="${ivy.default.ivy.user.dir}/local" failonerror="false"/> </target> <target name="-ivy-retrieve-custom" depends="-ivy-define-classpaths,-ivy-retrieve-web-jars">