Skip to content

Commit

Permalink
Separate clean target, fixing installer-translations fail, BR#3091.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Pope committed Sep 7, 2017
1 parent 3a8e610 commit 4ec58c0
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
</target>

<target name="prepareBaseFiles" depends="initDist,desktop-entry">
<antcall target="clean"/>
<antcall target="cleanMain"/>
<antcall target="package"/>
<mkdir dir="${freecol.release.dir}/base/${freecol.name}"/>
<copy todir="${freecol.release.dir}/base/${freecol.name}">
Expand All @@ -302,7 +302,7 @@
</target>

<target name="prepareSourceFiles" depends="initDist">
<antcall target="clean"/>
<antcall target="cleanMain"/>
<mkdir dir="${freecol.release.dir}/source/${freecol.name}"/>
<copy todir="${freecol.release.dir}/source/${freecol.name}">
<fileset dir="${basedir}"
Expand Down Expand Up @@ -546,8 +546,7 @@
</tar>
</target>

<!-- Cleans the directories by removing auto-generated files. -->
<target name="clean" depends="init"
<target name="cleanBuild" depends="init"
description="Cleans the directories by removing auto-generated files.">
<delete quiet="true" includeEmptyDirs="true">
<fileset dir="${freecol.build.dir}" includes="net/**" />
Expand All @@ -558,6 +557,10 @@
<fileset dir="${freecol.doc.dir}"
excludes="*.tex *.sty images/* specification.*" />
</delete>
</target>

<target name="cleanMain" depends="init"
description="Clean the main (non-build) tree by removing auto-generated files.">
<delete quiet="true" file="${freecol.jar.file}"/>
<delete quiet="true" file="${freecol.metaserver.jar.file}"/>
<delete quiet="true" file="TESTS-TestSuites.xml"/>
Expand All @@ -566,6 +569,10 @@
<delete quiet="true" file="${basedir}/test/data/specification.xml"/>
</target>

<target name="clean" depends="cleanBuild,cleanMain"
description="General cleanup.">
</target>

<target name="distclean" depends="init,clean"
description="Cleans the directories and removes the distribution directory.">
<delete quiet="true" includeEmptyDirs="true" followsymlinks="false"
Expand Down

0 comments on commit 4ec58c0

Please sign in to comment.