Merge branch 'master' of github.com:systemed/potlatch2

[potlatch2.git] / build.xml

diff --git a/build.xml b/build.xml
index 65f49ea..9bf885b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -20,6 +20,7 @@
   <target name="git-buildnumber" description="Store output from git-describe in ${buildnumber}" if="git.present">
     <exec outputproperty="build_number" executable="git" dir="${basedir}">
       <arg value="describe" />
+      <arg value="--tags" />
     </exec>
   </target>
 
@@ -332,15 +333,11 @@
 
   <target name="clean"
     description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <!--
-
-    FIXME what is supposed to be cleaned?
-
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-
-    -->
+    <delete dir="${basedir}/resources/generated"/>
+    <delete dir="${basedir}/resources/locales"/>
+    <delete>
+      <fileset dir="${basedir}/resources" includes="potlatch2.swf*"/>
+    </delete>
   </target>