From 2665cbbbe44afd3e1845b4f1a1ddb5000f109c55 Mon Sep 17 00:00:00 2001
From: unknown <geometer@.(none)>
Date: Sat, 20 Nov 2010 04:02:00 +0000
Subject: [PATCH] cleanup

---
 HowToBuild |   2 +-
 build.xml  | 268 ++++++++++++++++++++++++++---------------------------
 2 files changed, 132 insertions(+), 138 deletions(-)

diff --git a/HowToBuild b/HowToBuild
index 3533ce5c68d..8d78b41f57c 100644
--- a/HowToBuild
+++ b/HowToBuild
@@ -7,7 +7,7 @@ Prerequisites:
 
 2. Android NDK >= r4b
 
-3. python
+3. Apache Ant >= 1.7.1
 
 To build:
 
diff --git a/build.xml b/build.xml
index e761ae3e870..eb64a283cac 100644
--- a/build.xml
+++ b/build.xml
@@ -1,140 +1,134 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="FBReaderJ" default="package">
-    <property file="local.properties" />
-    <property file="build.properties" />
-    <property file="default.properties" />
-
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
-    </path>
-
-    <taskdef name="setup"
-             classname="com.android.ant.SetupTask"
-             classpathref="android.antlibs" />
-    <setup />
-
-    <target name="init" description="Initialization...">
-        <condition property="Ant17isOnline">
-            <and>
-                <antversion property="ant.version" atleast="1.7.0"/>
-            </and>
-        </condition>
-        <fail message="ANT with version at least 1.7 should be present !!! Update your local '${ant.version}' first.">
-            <condition>
-                <not>
-                    <isset property="Ant17isOnline"/>
-                </not>
-            </condition>
-        </fail>
-    </target>
-
-    <target name="native" unless="native.lib.is.built">
-        <echo message="Try to build 'libDeflatingDecompressor.so', 'libLineBreak.so'...."/>
-        <exec executable="${ndk.dir}/ndk-build" />
-    </target>
-
-    <target name="check.native.libs.are.present" depends="init">
-        <echo message="Check if Native Libs 'libDeflatingDecompressor.so', 'libLineBreak.so' are present and uptodate..."/>
-
-        <!-- Evaluate if it's necessary build 'C' sources and property 'native.lib.is.built' GETS VALUE , otherwise stays UNDEFINED -->
-        <condition property="native.lib.is.built" value="true">
-            <and>
-                <!-- Check if 'DeflatingDecompressor' C++ sources are up to date -->
-                <uptodate property="libDeflatingDecompressor-build-is-not-required" targetfile="libs/armeabi/libDeflatingDecompressor.so">
-                    <srcfiles dir="jni/DeflatingDecompressor" includes="**/*.cpp"/>
-                </uptodate>
-                <!-- Check if 'LineBreak' C++, C sources are up to date -->
-                <uptodate property="libLineBreak-build-is-not-required" targetfile="libs/armeabi/libLineBreak.so">
-                    <srcfiles dir="jni/LineBreak" includes="**/*.cpp,**/*.c,**/*.h"/>
-                </uptodate>
-                <!-- Check if *.so libraries are built and present in folder -->
-                <available file="./libs/armeabi/libDeflatingDecompressor.so" />
-                <available file="./libs/armeabi/libLineBreak.so" />
-            </and>
-        </condition>
-        <echo message="Is property 'native.lib.is.built' evaluated and setup to some VALUE ? value = '${native.lib.is.built}'"/>
-        <echo message="DONE! Check if Native Libs 'libDeflatingDecompressor.so', 'libLineBreak.so' are present and uptodate..."/>
-    </target>
-
-    <target name="resources" depends="init, check.native.libs.are.present">
-
-        <!-- Delete all files from /res/raw , /res/drawable  -->
-        <echo message="Clean up folders 'res/raw', 'res/drawable/'..." />
-        <delete dir="gen/text_search/" />
-        <delete dir="res/raw/">
-            <files includes="**"/>
-        </delete>
-        <delete dir="res/drawable/">
-            <files includes="**"/>
-        </delete>
-        <echo message="DONE! Clean up folders 'res/raw', 'res/drawable/'..." />
-
-        <!-- Copy all /icons/ files into /res/drawable  EXCEPT /icons/text_search folder -->
-        <echo message="Copying /icons files to 'res/drawable/' folder" />
-        <copy todir="res/drawable" verbose="false" overwrite="true">
-            <fileset file="icons/fbreader.png" excludes=".svn" />
-            <fileset dir="icons/tree/" includes="**" excludes=".svn" />
-            <fileset dir="icons/menu/" includes="**" excludes=".svn" />
-            <fileset dir="icons/tabs/" includes="**" excludes=".svn" />
-            <fileset dir="icons/others/" includes="**" excludes=".svn" />
-        </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="**" excludes=".svn" />
-        </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="**" excludes=".svn" />
-        </copy>
-        <echo message="DONE! Copy files like 'text_search_close_active.png' to /res/drawable..." />
-        <!--<exec executable="./createRawResources.py" />-->
-        <!--<exec executable="${ndk.dir}/ndk-build" />-->
-    </target>
-
-    <target name="package" depends="init, resources, native, release" />
-    <target name="dbg" depends="init, resources, native, debug" />
-
-    <target name="clean">
-        <echo message="Clean all temporary folders..." />
-        <delete dir="gen" />
-        <delete dir="bin" />
-        <delete dir="res/raw" />
-        <delete dir="res/drawable" />
-        <delete dir="out" />
-        <delete dir="libs/armeabi" />
-        <delete dir="obj" />
-    </target>
-
-    <!--<target name="release" depends="clean, resources, package"/>-->
-
+	<property file="local.properties" />
+	<property file="build.properties" />
+	<property file="default.properties" />
+
+	<path id="android.antlibs">
+		<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+		<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+		<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+		<pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+		<pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+	</path>
+
+	<taskdef name="setup"
+		classname="com.android.ant.SetupTask"
+		classpathref="android.antlibs" />
+
+	<setup />
+
+	<target name="init" description="Initialization...">
+		<condition property="Ant17isOnline">
+			<and>
+				<antversion property="ant.version" atleast="1.7.0"/>
+			</and>
+		</condition>
+		<fail message="ANT with version at least 1.7 should be present !!! Update your local '${ant.version}' first.">
+			<condition>
+				<not>
+					<isset property="Ant17isOnline"/>
+				</not>
+			</condition>
+		</fail>
+	</target>
+
+	<target name="native" unless="native.lib.is.built">
+		<echo message="Try to build 'libDeflatingDecompressor.so', 'libLineBreak.so'...."/>
+		<exec executable="${ndk.dir}/ndk-build" />
+	</target>
+
+	<target name="check.native.libs.are.present" depends="init">
+		<echo message="Check if Native Libs 'libDeflatingDecompressor.so', 'libLineBreak.so' are present and uptodate..."/>
+
+		<!-- Evaluate if it's necessary build 'C' sources and property 'native.lib.is.built' GETS VALUE , otherwise stays UNDEFINED -->
+		<condition property="native.lib.is.built" value="true">
+			<and>
+				<!-- Check if 'DeflatingDecompressor' C++ sources are up to date -->
+				<uptodate property="libDeflatingDecompressor-build-is-not-required" targetfile="libs/armeabi/libDeflatingDecompressor.so">
+					<srcfiles dir="jni/DeflatingDecompressor" includes="**/*.cpp"/>
+				</uptodate>
+				<!-- Check if 'LineBreak' C++, C sources are up to date -->
+				<uptodate property="libLineBreak-build-is-not-required" targetfile="libs/armeabi/libLineBreak.so">
+					<srcfiles dir="jni/LineBreak" includes="**/*.cpp,**/*.c,**/*.h"/>
+				</uptodate>
+				<!-- Check if *.so libraries are built and present in folder -->
+				<available file="./libs/armeabi/libDeflatingDecompressor.so" />
+				<available file="./libs/armeabi/libLineBreak.so" />
+			</and>
+		</condition>
+		<echo message="Is property 'native.lib.is.built' evaluated and setup to some VALUE ? value = '${native.lib.is.built}'"/>
+		<echo message="DONE! Check if Native Libs 'libDeflatingDecompressor.so', 'libLineBreak.so' are present and uptodate..."/>
+	</target>
+
+	<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>
+		<delete dir="res/drawable/">
+			<files includes="**"/>
+		</delete>
+		<echo message="DONE! Clean up folders 'gen/text_search' and 'res/drawable'..." />
+
+		<!-- Copy all icons/ files into res/drawable  EXCEPT /icons/text_search folder -->
+		<echo message="Copying icons files to 'res/drawable/' folder" />
+		<copy todir="res/drawable" verbose="false" overwrite="true">
+			<fileset file="icons/fbreader.png"/>
+			<fileset dir="icons/tree/" includes="**"/>
+			<fileset dir="icons/menu/" includes="**"/>
+			<fileset dir="icons/tabs/" includes="**"/>
+			<fileset dir="icons/others/" 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" />
+	<target name="dbg" depends="init, resources, native, debug" />
+
+	<target name="clean">
+		<echo message="Clean all temporary folders..." />
+		<delete dir="gen" />
+		<delete dir="bin" />
+		<delete dir="res/drawable" />
+		<delete dir="out" />
+		<delete dir="libs/armeabi" />
+		<delete dir="obj" />
+	</target>
 </project>