Merge lp:~karni/ubuntu-sso-android-library/ant-setup into lp:ubuntu-sso-android-library

[Michał Karnicki]

Updated ant setup with dependency on libUbuntuSSO.
Moved classpath and project dot files to templates.

=== modified file '.bzrignore'
--- .bzrignore	2011-07-29 18:34:11 +0000
+++ .bzrignore	2012-03-26 15:01:18 +0000
@@ -1,4 +1,10 @@
+.project
+.classpath
+local.properties
+proguard.cfg
 bin
 gen
-libs/*
-local.properties
+libs/libGoogleAnalytics.jar
+libs/signpost-commonshttp4-*.jar
+libs/signpost-core-*.jar
+libs/libUbuntuSSO-*.jar
 
=== removed file '.classpath'
--- .classpath	2011-09-15 22:34:32 +0000
+++ .classpath	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/*"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
 
=== added file '.classpath.template'
--- .classpath.template	1970-01-01 00:00:00 +0000
+++ .classpath.template	2012-03-26 15:01:18 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="libs/signpost-core-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/signpost-commonshttp4-1.2.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/libUbuntuSSO-0.1.0.jar"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
 
=== removed file '.project'
--- .project	2011-07-20 13:04:09 +0000
+++ .project	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ubuntu-sso-android-client</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
 
=== added file '.project.template'
--- .project.template	1970-01-01 00:00:00 +0000
+++ .project.template	2012-03-26 15:01:18 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ubuntu-sso-android-library</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
 
=== modified file 'HACKING.txt'
--- HACKING.txt	2011-07-28 18:34:04 +0000
+++ HACKING.txt	2012-03-26 15:01:18 +0000
@@ -1,7 +1,3 @@
-To compile, run:
-$ ./setup.sh
-
-Copy ubuntu-sso-java-client.jar into ubuntu-sso-android-client/libs
-(see HACKING.txt of lp:ubuntu-sso-java-client on how to build this jar) 
-
-$ ant compile
+To download dependencies:
+$ ant setup
+
 
=== added file 'ant.properties'
--- ant.properties	1970-01-01 00:00:00 +0000
+++ ant.properties	2012-03-26 15:01:18 +0000
@@ -0,0 +1,26 @@
+# Library versions.
+
+lib.google-analytics.ver=1.4.2
+lib.signpost.ver=1.2.1.1
+lib.ubuntu-sso-java-library.ver=0.1.0
+
+# Library jar file names.
+
+lib.google-analytics.zip=GoogleAnalyticsAndroid_${lib.google-analytics.ver}.zip
+lib.google-analytics.jar=libGoogleAnalytics.jar
+lib.signpost-core.jar=signpost-core-${lib.signpost.ver}.jar
+lib.signpost-commonshttp4.jar=signpost-commonshttp4-${lib.signpost.ver}.jar
+lib.ubuntu-sso-java-library.jar=libUbuntuSSO-${lib.ubuntu-sso-java-library.ver}.jar
+
+# Library jar download urls.
+
+url.goog=http://dl.google.com/gaformobileapps
+lib.google-analytics.url=${url.goog}/${lib.google-analytics.zip}
+
+url.oasp=http://oauth-signpost.googlecode.com/files
+lib.signpost-core.url=${url.oasp}/${lib.signpost-core.jar}
+lib.signpost-commonshttp4.url=${url.oasp}/${lib.signpost-commonshttp4.jar}
+
+url.lp=http://launchpad.net
+lib.ubuntu-sso-java-library.url=${url.lp}/ubuntu-sso-java-library/trunk/${lib.ubuntu-sso-java-library.ver}/+download/${lib.ubuntu-sso-java-library.jar}
+
 
=== modified file 'build.xml'
--- build.xml	2011-07-21 21:33:36 +0000
+++ build.xml	2012-03-26 15:01:18 +0000
@@ -1,79 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ubuntu-sso-android-client" 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. -->
-    <property file="local.properties" />
-
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
-         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'.
-
-         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="build.properties" />
-
-    <!-- The default.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
-
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
-
+<project name="ubuntu-sso-android-library" basedir="." default="help">
+
+	<description>
+	*** Ubuntu SSO Android library ***
+
+	Ubuntu Single Sign On Android library
+
+	http://one.ubuntu.com
+	http://one.ubuntu.com/developer
+	http://launchpad.net/ubuntu-sso-android-library
+
+	You can use this library to easily request authentication to Ubuntu One.
+	If the official Ubuntu One Files app is installed on the device,
+	the user will be presented with be asked to authorize access to U1.
+	Otherwise, a dialog will be shown where the user can log in to Ubuntu One
+	to retrieve an OAuth access token.
+
+	For example usage, see
+	https://code.launchpad.net/ubuntu-sso-android-library
+
+	IRC: #ubuntuone @ irc.freenode.net
+
+	For instructions on building, see HACKING.txt
+	</description>
+
+	<!-- Check if android is present. -->
+	<exec executable="./tools.sh" failonerror="true">
+	</exec>
+
+	<loadproperties srcFile="project.properties" />
+
+	<exec executable="android">
+		<arg value="update" />
+	<arg value="lib-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" />
+
+	<!-- 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 an env var"
+			unless="sdk.dir"
+	/>
+
+	<!-- 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" />
+
+	<property name="libs" value="libs" />
+
+	<target name="clean-libs">
+		<delete dir="${libs}" quiet="true" />
+		<mkdir dir="${libs}" />
+	</target>
+
+	<target name="get-libs">
+		<mkdir dir="${libs}" />
+
+		<!-- Google Analytics -->
+		<get src="${lib.google-analytics.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="10" />
+		<unzip src="${libs}/${lib.google-analytics.zip}" dest="${libs}">
+			<patternset>
+				<include name="**/${lib.google-analytics.jar}" />
+			</patternset>
+			<mapper type="flatten"/>
+		</unzip>
+		<delete file="${libs}/${lib.google-analytics.zip}" quiet="true" />
+
+		<!-- SignPost Core -->
+		<get src="${lib.signpost-core.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- SignPost CommonsHttp4 -->
+		<get src="${lib.signpost-commonshttp4.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+		
+		<!-- Ubuntu SSO Java library -->
+		<get src="${lib.ubuntu-sso-java-library.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+	</target>
+
+	<target name="setup" depends="get-libs"
+		description="Download porject dependencies.">
+		<echo message="Downloaded all project dependencies." />
+	</target>
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
+	 in between standard targets -->
 <!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
+	<target name="-pre-build">
+	</target>
+	<target name="-pre-compile">
+	</target>
 
-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
+	/* This is typically used for code obfuscation.
+	   Compiled code location: ${out.classes.absolute.dir}
+	   If this is not done in place, override ${out.dex.input.absolute.dir} */
+	<target name="-post-compile">
+	</target>
 -->
 
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <setup> task.
-             - customize it to your needs.
-         - Customize the whole script.
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
-             - customize to your needs.
-    -->
-    <setup />
+	<!-- Import the actual build file.
+
+		 To customize existing targets, there are two options:
+		 - Customize only one target:
+			 - copy/paste the target into this file, *before* the
+			   <import> task.
+			 - customize it to your needs.
+		 - Customize the whole content of build.xml
+			 - copy/paste the content of the rules files (minus the top node)
+			   into this file, replacing the <import> task.
+			 - customize to your needs.
+
+		 ***********************
+		 ****** IMPORTANT ******
+		 ***********************
+		 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: custom -->
+	<import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>
 
=== added directory 'libs'
=== removed directory 'libs'
=== modified file 'proguard.cfg'
--- proguard.cfg	2011-07-19 17:27:13 +0000
+++ proguard.cfg	2012-03-26 15:01:18 +0000
@@ -18,14 +18,18 @@
     native <methods>;
 }
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }
 
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
+}
+
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
 
=== added file 'project.properties'
--- project.properties	1970-01-01 00:00:00 +0000
+++ project.properties	2012-03-26 15:01:18 +0000
@@ -0,0 +1,12 @@
+# 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,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+android.library=true
+# Project target.
+target=android-7
 
=== removed file 'setup.sh'
--- setup.sh	2011-08-09 14:35:20 +0000
+++ setup.sh	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-##  TODO:  One day, move all this into the build.xml file.  The file tests are ripe for use by ant.
-
-if test "$1" = "cleanlib"; then
-	rm libs/*
-	bzr revert libs/
-fi
-
-PROJECTROOT=$(bzr root || pwd)
-
-ANDROIDBIN=$(which android)
-if test -z "${DOWNLOADER}"; then which wget >/dev/null && DOWNLOADER="$(which wget) --no-verbose -O "; fi
-if test -z "${DOWNLOADER}"; then which curl >/dev/null && DOWNLOADER="$(which curl) -o "; fi
-
-if test -z "${ANDROIDBIN}"; then
-	echo "Android SDK tools not in PATH." >&2
-	echo "   PATH=\$PATH:/PathToSDK/tools" >&2
-	return 1
-fi
-
-if test -z "${DOWNLOADER}"; then
-	echo "Need wget or curl to download." >&2
-	return 1
-fi
-
-GITBIN=$(which git)
-if test -z "${GITBIN}"; then
-	echo "You need git to download GreenDroid lib." >&2
-fi
-
-trap "echo ' ====  Not Successful. ===='" EXIT
-set -e
-
-echo "Downloading dependencies."
-pushd "${PROJECTROOT}"/libs
-
-first() { printf -v $1 "%s" $2; }
-
-general_download() {
-	local filename=$1
-	local urlstart=$2
-	echo "  - ${filename}"
-	if test -f "${filename}" && file "${filename}" | grep -i "zip" >/dev/null; then
-		:
-	else
-		rm -f "${filename}"
-		first nearby_copy ../../*/libs/${filename} >/dev/null
-		cp -l "${nearby_copy}" . || ${DOWNLOADER} "${filename}" "${urlstart}/${filename}" >/dev/null
-		
-		# Unzip Google Analytics:
-		if grep -i "analytics" "${filename}" >/dev/null; then
-			jarname="libGoogleAnalytics.jar"
-			unzip "${filename}" "${jarname}"
-			# Remove the zip file.
-			rm -f "${filename}"
-			filename="${jarname}"
-		fi
-	fi
-	file "${filename}" |grep -i "zip archive" >/dev/null
-	return $?
-}
-
-launchpad_jar_download() {
-	local project_name=$1
-	local project_rev=$2
-
-	general_download "${project_name}-${project_rev}.jar" "http://launchpad.net/${project_name}/trunk/${project_rev}/+download"
-	return $?
-}
-
-# If you add new downloadable jar files here, please add a wildcard to
-# ".bzrignore" to match it in libs/ , and "bzr remove" the existing file if
-# it's in the branch.
-
-SIGNPOSTVER=1.2.1.1
-general_download "signpost-core-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
-general_download "signpost-commonshttp4-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
-USSO_JAVA_CLIENT_REV=rev14
-launchpad_jar_download "ubuntu-sso-java-client" "${USSO_JAVA_CLIENT_REV}"
-GOOGLE_ANALYTICS_VER=1.2
-general_download "GoogleAnalyticsAndroid_${GOOGLE_ANALYTICS_VER}.zip" "http://dl.google.com/gaformobileapps"
-
-
-popd
-
-echo "Updating local project files for this machine and SDK."
-APILEVELID=$(android list target |grep "android-7"|cut -d " " -f 2)
-test "${APILEVELID}" || { echo "Android SDK has no 2.1 API, (level 7). Please install.  SDK/tools/android"; false; }
-android update lib-project --path ../ubuntu-sso-android-client --target "${APILEVELID}"
-
-echo 
-trap EXIT
 
=== added file 'tools.sh'
--- tools.sh	1970-01-01 00:00:00 +0000
+++ tools.sh	2012-03-26 15:01:18 +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