From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Mon, 25 Jun 2012 17:46:31 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:owncloud/android-devel
X-Git-Tag: oc-android-1.4.3~337
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b22ad95e2fe78bc03a43c83dfef6232a187d8fdd?hp=ec38629eca5cf20c1e05a6e1562011b6d47798b5

Merge branch 'master' of gitorious.org:owncloud/android-devel
---

diff --git a/README.setup b/README.setup
new file mode 100644
index 00000000..8a1a2ce6
--- /dev/null
+++ b/README.setup
@@ -0,0 +1,11 @@
+If you want to start development of ownCloud android client you have two way to do so
+(a) building with console
+(b) building with eclipse
+
+1. Use setup_env.sh
+2a. ant clean;ant debug
+2b. Open Eclipse and import actionbarsherlock/library project to your workspace
+
+after those space you should be good to go.
+
+HAVE FUN!
diff --git a/build.xml b/build.xml
new file mode 100644
index 00000000..2221a7d7
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="ownCloud" 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 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" />
+
+    <!-- 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 an env var"
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (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})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- 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: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/setup_env.sh b/setup_env.sh
new file mode 100755
index 00000000..7ac09abe
--- /dev/null
+++ b/setup_env.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git submodule init
+git submodule update
+android update project -p actionbarsherlock/library
+android update project -p .
+