From 6adb5a729a401cc10a66371cd229435449455cc6 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 20 Nov 2010 05:33:34 +0000
Subject: [PATCH] clean target has been splitted into clean (that deletes
 temporary files) and distclean (that depends on clean and deletes native
 libraries too)

---
 build.xml | 47 +++++++----------------------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

diff --git a/build.xml b/build.xml
index eb64a283c..ff90a5ba7 100644
--- a/build.xml
+++ b/build.xml
@@ -64,14 +64,11 @@
 	<target name="resources" depends="init, check.native.libs.are.present">
 
 		<!-- Delete all files from gen/text_search and res/drawable  -->
-		<echo message="Clean up folders 'gen/text_search' and 'res/drawable'..." />
-		<delete dir="gen/text_search/">
-			<files includes="**"/>
-		</delete>
+		<echo message="Clean up 'res/drawable' folder..." />
 		<delete dir="res/drawable/">
 			<files includes="**"/>
 		</delete>
-		<echo message="DONE! Clean up folders 'gen/text_search' and 'res/drawable'..." />
+		<echo message="DONE! Clean up 'res/drawable' folder..." />
 
 		<!-- Copy all icons/ files into res/drawable  EXCEPT /icons/text_search folder -->
 		<echo message="Copying icons files to 'res/drawable/' folder" />
@@ -81,42 +78,9 @@
 			<fileset dir="icons/menu/" includes="**"/>
 			<fileset dir="icons/tabs/" includes="**"/>
 			<fileset dir="icons/others/" includes="**"/>
+			<fileset dir="icons/text_search/" includes="**"/>
 		</copy>
 		<echo message="DONE! Copying icons files to 'res/drawable/' folder" />
-
-		<!-- Copy all icons/text_search and prepare for file name changing -->
-		<echo message="Copying 'search_text' files to temporal folder" />
-		<copy todir="gen/text_search/" verbose="false" overwrite="true">
-			<fileset dir="icons/text_search/" includes="**" />
-		</copy>
-		<echo message="DONE! Copying 'search_text' files to temporal folder" />
-
-		<!-- Rename file names like 'close-active.png' to 'close_active.png' -->
-		<echo message="Renaming file names with '*-*' into '*_*' names" />
-		<move todir="gen/text_search/">
-			<fileset dir="gen/text_search/" />
-			<mapper>
-				<mapper type="regexp" from="^([a-z0-9A-Z_:@?=+,!~+%$]+)(-)([a-z0-9A-Z_:@?=+,!~+%$]+)\.(xml|png)$" to="\1_\3.\4" />
-			</mapper>
-		</move>
-		<echo message="DONE! Renaming file names with '*-*' into '*_*' names" />
-
-		<!-- Append 'text_search_' for changing file name from 'close_active.png' to 'text_search_close_active.png' -->
-		<echo message="Append 'text_search+' to 'xxx_xxx.*' file name..." />
-		<move todir="gen/text_search/">
-			<fileset dir="gen/text_search/" />
-			<mapper>
-				<mapper type="glob" from="*.xml" to="text_search_*.xml" />
-				<mapper type="glob" from="*.png" to="text_search_*.png" />
-			</mapper>
-		</move>
-		<echo message="DONE! Append 'text_search+' to 'xxx_xxx.*' file name..." />
-
-		<echo message="Copy files like 'text_search_close_active.png' to /res/drawable..." />
-		<copy todir="res/drawable/" verbose="false" overwrite="true">
-			<fileset dir="gen/text_search/" includes="**" />
-		</copy>
-		<echo message="DONE! Copy files like 'text_search_close_active.png' to /res/drawable..." />
 	</target>
 
 	<target name="package" depends="init, resources, native, release" />
@@ -128,7 +92,10 @@
 		<delete dir="bin" />
 		<delete dir="res/drawable" />
 		<delete dir="out" />
-		<delete dir="libs/armeabi" />
 		<delete dir="obj" />
 	</target>
+
+	<target name="distclean" depends="clean">
+		<delete dir="libs" />
+	</target>
 </project>