Browse files

SDK r14

  • Loading branch information...
1 parent 64f068a commit 47ce3f90c9d8016c956293cc0f8c7220a3a06879 @geometer geometer committed Oct 21, 2011
Showing with 42 additions and 27 deletions.
  1. +18 −0 ant.properties
  2. +0 −3 build.properties
  3. +19 −19 build.xml
  4. +5 −5 default.properties → project.properties
View
18 ant.properties
@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+application-package=org.geometerplus.zlibrary.ui.android.library
View
3 build.properties
@@ -1,3 +0,0 @@
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
-application-package=org.geometerplus.zlibrary.ui.android.library
View
38 build.xml
@@ -1,22 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="FBReaderJ" default="package">
- <property file="local.properties" />
- <property file="build.properties" />
- <property file="default.properties" />
+<project name="FBReaderJ" default="help">
+ <loadproperties srcFile="local.properties" />
+ <property file="ant.properties" />
+ <loadproperties srcFile="project.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 />
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+ unless="sdk.dir"
+ />
<target name="init" description="Initialization...">
<fail message="Ant 1.7.0 or higher is required. Please upgrade your ant.">
@@ -73,9 +65,15 @@
<echo message="DONE (Copying icons files to 'res/drawable/' folder)" />
</target>
- <target name="package" depends="init, resources, native, release" />
- <target name="dbg" depends="init, resources, native, debug" />
+ <target name="-pre-build" depends="init, resources, native">
+ </target>
+<!--
+ <target name="-pre-compile">
+ </target>
+ <target name="-post-compile">
+ </target>
+-->
<target name="clean">
<echo message="Deleting temporary files..." />
<delete dir="gen" />
@@ -92,4 +90,6 @@
<delete dir="libs/armeabi-v7" />
<echo message="DONE (Deleting native libraries)" />
</target>
+
+ <import file="${sdk.dir}/tools/ant/build.xml" />
</project>
View
10 default.properties → project.properties
@@ -1,13 +1,13 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
+#
# This file must be checked in Version Control Systems.
-#
+#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
-# Project target.
-target=android-8
java.encoding=utf-8
proguard.config=proguard.cfg
+# Project target.
+target=android-8

0 comments on commit 47ce3f9

Please sign in to comment.