build procedure has been changed

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1627 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

HowToBuild

@@ -1,14 +1,23 @@
 How to Build for Android
 ------------------------
 
-Requirements: Android SDK 1.6, Android NDK 1.5
+Prerequisites:
 
-1. Compile native code.
-   This step could be skipped, prebuilded native libraries are currently included into the source package.
+1. Android SDK >= 1.6
 
-2. Create 'local.properties' file containing sdk-location definition:
-	sdk-location=<path to the Android SDK folder>
+2. Android NDK >= r4b
 
-3. Run './createRawResources.py'.
+3. python
 
-4. Run 'ant release'.
+To build:
+
+1. Create 'local.properties' file containing sdk.dir && ndk.dir definitions:
+	sdk.dir=<path to the Android SDK folder>/tools
+	ndk.dir=<path to the Android NDK folder>
+E.g., on my computer 'local.properties' consists of 2 lines:
+  sdk.dir=/Users/geometer/android-sdk-mac_86
+  ndk.dir=/Users/geometer/android-ndk-r4b
+
+2. Run 'ant'.
+
+3. Sign your package manually.

build.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="FBReaderJ" default="help">
+<project name="FBReaderJ" default="package">
 	<property file="local.properties"/>
 	<property file="build.properties"/>
 	<property file="default.properties"/>
 
 	<path id="android.antlibs">
-		<pathelement path="${sdk-location}/tools/lib/anttasks.jar" />
-		<pathelement path="${sdk-location}/tools/lib/sdklib.jar" />
-		<pathelement path="${sdk-location}/tools/lib/androidprefs.jar" />
-		<pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" />
-		<pathelement path="${sdk-location}/tools/lib/jarutils.jar" />
+		<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"
@@ -18,10 +18,30 @@
 
 	<setup />
 
+  <target name="native">
+		<exec executable="${ndk.dir}/ndk-build">
+			<arg value="-C"/>
+			<arg value="jni"/>
+		</exec>
+	</target>
+
+  <target name="resources">
+		<exec executable="./createRawResources.py"/>
+	</target>
+
+  <target name="package" depends="native,resources,release">
+	</target>
+
   <target name="clean">
 		<delete dir="gen"/>
 		<delete dir="bin"/>
 		<delete dir="res/raw"/>
 		<delete dir="res/drawable"/>
+		<exec executable="${ndk.dir}/ndk-build">
+			<arg value="-C"/>
+			<arg value="jni"/>
+			<arg value="clean"/>
+		</exec>
+		<delete dir="obj"/>
   </target>
 </project>