Merge lp:~humpolec-team/humpolec/cleanup-ant-setup into lp:~humpolec-team/humpolec/UbuntuInstaller-refactor

[Michał Karnicki]

Clean-up ant setup. Note ant.properties pointing to key store. I have a feeling make_release script does some shenanigans. We should use `ant release` instead.

[lp:~humpolec-team/humpolec/cleanup-ant-setup]

67. By Michał Karnicki on 2014-04-01

Remove incorrect bzr ignore.

[Ondrej Kubik (ondrak)]

Looks good

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-03-25 00:47:52 +0000
+++ .bzrignore	2014-04-01 17:33:26 +0000
@@ -3,5 +3,4 @@
 local.properties
 bin
 gen
-android-ubuntu-launcher.apk
 
 
=== added file 'ant.properties'
--- ant.properties	1970-01-01 00:00:00 +0000
+++ ant.properties	2014-04-01 17:33:26 +0000
@@ -0,0 +1,21 @@
+# 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.
+
+java.encoding=UTF-8
+
+key.store=../humpolec.keystore
+key.alias=humpolec
 
=== modified file 'build.xml'
--- build.xml	2013-12-08 16:01:23 +0000
+++ build.xml	2014-04-01 17:33:26 +0000
@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="MainActivity" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
+<project name="ubuntu-dual-boot" default="help">
+
+    <description>
+    *** Humpolec - Ubuntu Dual Boot for Android ***
+
+    http://launchpad.net/humpolec
+
+    Ubuntu Dual Boot is provided to developers who want to contribute to development
+    of Ubuntu for Phones and give them an ability to run Ubuntu and Android on
+    a single device. It is not intended to be used by regular users.
+
+    Make sure you have Android SDK installed!
+
+    Contact:
+    Ondrej Kubik     [e-mail]
+    Michal Karnicki  [e-mail]
+    </description>
+
+    <!-- Check if android is present. -->
+    <exec executable="./check-sdk.sh" failonerror="true">
+    </exec>
+
+    <property file="project.properties" />
+
+    <exec executable="android">
+        <arg value="update" />
+        <arg value="project" />
+        <arg value="-p" />
+        <arg value="." />
+        <arg value="-t" />
+        <arg value="${target}" />
+    <!-- Watch out: using name argument will ignore the custom build.xml version-tag! -->
+    </exec>
+
     <property file="local.properties" />
 
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
     <property file="ant.properties" />
 
     <!-- if sdk.dir was not set from one of the property file, then
@@ -37,17 +46,6 @@
         <isset property="env.ANDROID_HOME" />
     </condition>
 
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
     <!-- quick check on sdk.dir -->
     <fail
             message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
@@ -86,7 +84,7 @@
          In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
          in order to avoid having your file be overridden by tools such as "android update project"
     -->
-    <!-- version-tag: 1 -->
+    <!-- version-tag: custom -->
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>
 
=== added file 'check-sdk.sh'
--- check-sdk.sh	1970-01-01 00:00:00 +0000
+++ check-sdk.sh	2014-04-01 17:33:26 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+ANDROIDBIN=$(which android)
+if test -z "${ANDROIDBIN}"; then
+        echo "Android SDK tools not in PATH, fix with:" >&2
+        echo "   PATH=\$PATH:/PathToSDK/tools" >&2
+        exit 1
+fi
+
+exit 0
 
=== modified file 'project.properties'
--- project.properties	2013-12-12 02:02:35 +0000
+++ project.properties	2014-04-01 17:33:26 +0000
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:19
+target=android-19