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

Proposed by Michał Karnicki
Status: Merged
Approved by: Ondrej Kubik
Approved revision: 67
Merged at revision: 66
Proposed branch: lp:~humpolec-team/humpolec/cleanup-ant-setup
Merge into: lp:~humpolec-team/humpolec/UbuntuInstaller-refactor
Diff against target: 157 lines (+67/-39)
5 files modified
.bzrignore (+0/-1)
ant.properties (+21/-0)
build.xml (+35/-37)
check-sdk.sh (+10/-0)
project.properties (+1/-1)
To merge this branch: bzr merge lp:~humpolec-team/humpolec/cleanup-ant-setup
Reviewer Review Type Date Requested Status
Ondrej Kubik Approve
Review via email: mp+213694@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
67. By Michał Karnicki

Remove incorrect bzr ignore.

Revision history for this message
Ondrej Kubik (ondrak) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-03-25 00:47:52 +0000
3+++ .bzrignore 2014-04-01 17:33:26 +0000
4@@ -3,5 +3,4 @@
5 local.properties
6 bin
7 gen
8-android-ubuntu-launcher.apk
9
10
11=== added file 'ant.properties'
12--- ant.properties 1970-01-01 00:00:00 +0000
13+++ ant.properties 2014-04-01 17:33:26 +0000
14@@ -0,0 +1,21 @@
15+# This file is used to override default values used by the Ant build system.
16+#
17+# This file must be checked in Version Control Systems, as it is
18+# integral to the build system of your project.
19+
20+# This file is only used by the Ant script.
21+
22+# You can use this to override default values such as
23+# 'source.dir' for the location of your java source folder and
24+# 'out.dir' for the location of your output folder.
25+
26+# You can also use it define how the release builds are signed by declaring
27+# the following properties:
28+# 'key.store' for the location of your keystore and
29+# 'key.alias' for the name of the key to use.
30+# The password will be asked during the build when you use the 'release' target.
31+
32+java.encoding=UTF-8
33+
34+key.store=../humpolec.keystore
35+key.alias=humpolec
36
37=== modified file 'build.xml'
38--- build.xml 2013-12-08 16:01:23 +0000
39+++ build.xml 2014-04-01 17:33:26 +0000
40@@ -1,31 +1,40 @@
41 <?xml version="1.0" encoding="UTF-8"?>
42-<project name="MainActivity" default="help">
43-
44- <!-- The local.properties file is created and updated by the 'android' tool.
45- It contains the path to the SDK. It should *NOT* be checked into
46- Version Control Systems. -->
47+<project name="ubuntu-dual-boot" default="help">
48+
49+ <description>
50+ *** Humpolec - Ubuntu Dual Boot for Android ***
51+
52+ http://launchpad.net/humpolec
53+
54+ Ubuntu Dual Boot is provided to developers who want to contribute to development
55+ of Ubuntu for Phones and give them an ability to run Ubuntu and Android on
56+ a single device. It is not intended to be used by regular users.
57+
58+ Make sure you have Android SDK installed!
59+
60+ Contact:
61+ Ondrej Kubik ondrej.kubik@canonical.com
62+ Michal Karnicki michal.karnicki@canonical.com
63+ </description>
64+
65+ <!-- Check if android is present. -->
66+ <exec executable="./check-sdk.sh" failonerror="true">
67+ </exec>
68+
69+ <property file="project.properties" />
70+
71+ <exec executable="android">
72+ <arg value="update" />
73+ <arg value="project" />
74+ <arg value="-p" />
75+ <arg value="." />
76+ <arg value="-t" />
77+ <arg value="${target}" />
78+ <!-- Watch out: using name argument will ignore the custom build.xml version-tag! -->
79+ </exec>
80+
81 <property file="local.properties" />
82
83- <!-- The ant.properties file can be created by you. It is only edited by the
84- 'android' tool to add properties to it.
85- This is the place to change some Ant specific build properties.
86- Here are some properties you may want to change/update:
87-
88- source.dir
89- The name of the source directory. Default is 'src'.
90- out.dir
91- The name of the output directory. Default is 'bin'.
92-
93- For other overridable properties, look at the beginning of the rules
94- files in the SDK, at tools/ant/build.xml
95-
96- Properties related to the SDK location or the project target should
97- be updated using the 'android' tool with the 'update' action.
98-
99- This file is an integral part of the build system for your
100- application and should be checked into Version Control Systems.
101-
102- -->
103 <property file="ant.properties" />
104
105 <!-- if sdk.dir was not set from one of the property file, then
106@@ -37,17 +46,6 @@
107 <isset property="env.ANDROID_HOME" />
108 </condition>
109
110- <!-- The project.properties file is created and updated by the 'android'
111- tool, as well as ADT.
112-
113- This contains project specific properties such as project target, and library
114- dependencies. Lower level build properties are stored in ant.properties
115- (or in .classpath for Eclipse projects).
116-
117- This file is an integral part of the build system for your
118- application and should be checked into Version Control Systems. -->
119- <loadproperties srcFile="project.properties" />
120-
121 <!-- quick check on sdk.dir -->
122 <fail
123 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."
124@@ -86,7 +84,7 @@
125 In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
126 in order to avoid having your file be overridden by tools such as "android update project"
127 -->
128- <!-- version-tag: 1 -->
129+ <!-- version-tag: custom -->
130 <import file="${sdk.dir}/tools/ant/build.xml" />
131
132 </project>
133
134=== added file 'check-sdk.sh'
135--- check-sdk.sh 1970-01-01 00:00:00 +0000
136+++ check-sdk.sh 2014-04-01 17:33:26 +0000
137@@ -0,0 +1,10 @@
138+#!/bin/bash
139+
140+ANDROIDBIN=$(which android)
141+if test -z "${ANDROIDBIN}"; then
142+ echo "Android SDK tools not in PATH, fix with:" >&2
143+ echo " PATH=\$PATH:/PathToSDK/tools" >&2
144+ exit 1
145+fi
146+
147+exit 0
148
149=== modified file 'project.properties'
150--- project.properties 2013-12-12 02:02:35 +0000
151+++ project.properties 2014-04-01 17:33:26 +0000
152@@ -11,4 +11,4 @@
153 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
154
155 # Project target.
156-target=Google Inc.:Google APIs:19
157+target=android-19

Subscribers

People subscribed via source and target branches