remove release.dir property

This commit is contained in:
millmanorama 2017-04-11 17:57:49 +02:00
parent 33cd0c1191
commit 23938f65b8

View File

@ -7,7 +7,6 @@
<import file="nbproject/build-impl.xml"/> <import file="nbproject/build-impl.xml"/>
<import file="../BootstrapIvy.xml"/> <import file="../BootstrapIvy.xml"/>
<property name="release.dir" value="${basedir}/release"/>
<target name="get-thirdparty-tools" > <target name="get-thirdparty-tools" >
<copy todir="${basedir}/release/pasco2"> <copy todir="${basedir}/release/pasco2">
@ -21,20 +20,18 @@
</copy> </copy>
</target> </target>
<target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy"> <target name="get-deps" depends="init-ivy,get-thirdparty-tools">
<!-- fetch all the dependencies from Ivy and stick them in the right places --> <!-- fetch all the dependencies from Ivy and stick them in the right places -->
<ivy:resolve/> <ivy:resolve/>
<ivy:retrieve conf="recent-activity" sync="true" pattern="${release.dir}/modules/ext/[artifact]-[revision](-[classifier]).[ext]" /> <ivy:retrieve conf="recent-activity" sync="true" pattern="${basedir}/release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
<antcall target="get-thirdparty-tools"/>
</target> </target>
<target name="init" depends="get-deps,harness.init"/>
<target name="clean" depends="projectized-common.clean"> <target name="clean" depends="projectized-common.clean">
<!--Override clean to delete jars, etc downloaded with Ivy <!--Override clean to delete jars, etc downloaded with Ivy
or copied in from thirdparty folder. This way we don't end up with or copied in from thirdparty folder. This way we don't end up with
out-of-date/unneeded stuff in the installer--> out-of-date/unneeded stuff in the installer-->
<mkdir dir="${release.dir}"/> <delete dir="${basedir}/release" />
<delete includeemptydirs="true">
<fileset dir="${release.dir}" includes="**/*"/>
</delete>
</target> </target>
</project> </project>