From 1b3c3a3ece9619d6010d3e2490e7067b392b1b47 Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 6 Aug 2013 11:19:30 +0200 Subject: [PATCH 1/4] added more detailed download and compile instructions. fixed setup_env.bat added target/ to .gitignore --- .gitignore | 3 ++- SETUP.md | 36 ++++++++++++++++++++++++------------ setup_env.bat | 9 +++++---- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 0105cb345b..63b41a5216 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,10 @@ # generated files bin/ gen/ +target/ # Local configuration file (sdk path, etc) local.properties # Mac .DS_Store files -.DS_Store +.DS_Store \ No newline at end of file diff --git a/SETUP.md b/SETUP.md index d527d4feaa..692c8c467e 100644 --- a/SETUP.md +++ b/SETUP.md @@ -1,22 +1,34 @@ - If you want to start development of ownCloud android client you have two way to do so: + If you want to start development of ownCloud first download required files, then compile using console or Eclipse, finally create pull request: + + 1. Fork and download android/develop repository: + + - Navigate to https://github.com/owncloud/android, click fork. + - Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git" + - Checkout remote develop branch: "git checkout -b develop remotes/origin/develop" - 1. Building with console: + 2. Building with console: - Use setup_env.sh or setup_env.bat - - NOTE: You must have git, ant/bin, android/tools in your enviroment path + - NOTE: You must have mvn, git, ant/bin, android/tools, and 'platforms-tools' in your enviroment path + - Now you can create APK using "mvn package" - 2. Building with eclipse: + 3. Building with eclipse: - - Run ant clean debug + - TODO: FIX + - Run "ant clean debug" - Open Eclipse and import *actionbarsherlock/library* project to your workspace - - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh - - After those actions you should be good to go. - - HAVE FUN! - - + - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh + - After those actions you should be good to go. HAVE FUN! + + 4. Create pull request: + + - Commit your changes locally: "git commit -a" + - Push your changes to your Github repo: "git push" + - Browse to https://github.com/YOURGITHUBNAME/android/pulls + - Click "Edit" and set "base:develop" + - Again, click "Edit" and set "compare:develop" + - Enter description and send pull request. diff --git a/setup_env.bat b/setup_env.bat index c0bfeb4f3d..c13edca2aa 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -1,7 +1,8 @@ git submodule init git submodule update -android.bat update project -p actionbarsherlock\library --target 1 -android.bat update project -p . --target 1 -cp third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar +call android.bat update project -p actionbarsherlock\library --target 1 +call android.bat update project -p . --target 1 +copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar cd tests -android.bat update test-project -m .. -p . \ No newline at end of file +android.bat update test-project -m .. -p . +cd .. \ No newline at end of file From c93b552db515c52afd92a6b4cc3a124b0dc30300 Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 6 Aug 2013 11:27:07 +0200 Subject: [PATCH 2/4] mc --- .gitignore | 2 +- SETUP.md | 4 ++-- setup_env.bat | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 63b41a5216..7a3b8360bf 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,4 @@ target/ local.properties # Mac .DS_Store files -.DS_Store \ No newline at end of file +.DS_Store diff --git a/SETUP.md b/SETUP.md index 692c8c467e..ca7a25ab9f 100644 --- a/SETUP.md +++ b/SETUP.md @@ -15,7 +15,7 @@ 3. Building with eclipse: - - TODO: FIX + - TODO: FIX / MORE DETAILS - Run "ant clean debug" - Open Eclipse and import *actionbarsherlock/library* project to your workspace - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh @@ -25,7 +25,7 @@ - Commit your changes locally: "git commit -a" - Push your changes to your Github repo: "git push" - - Browse to https://github.com/YOURGITHUBNAME/android/pulls + - Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request - Click "Edit" and set "base:develop" - Again, click "Edit" and set "compare:develop" - Enter description and send pull request. diff --git a/setup_env.bat b/setup_env.bat index c13edca2aa..3f03856ea6 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -5,4 +5,4 @@ call android.bat update project -p . --target 1 copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar cd tests android.bat update test-project -m .. -p . -cd .. \ No newline at end of file +cd .. From fb9a226be613cd7dbe6d6d5762d99af8a169c099 Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 6 Aug 2013 13:46:53 +0200 Subject: [PATCH 3/4] mc --- setup_env.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup_env.bat b/setup_env.bat index 3f03856ea6..85f45086ff 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -4,5 +4,5 @@ call android.bat update project -p actionbarsherlock\library --target 1 call android.bat update project -p . --target 1 copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar cd tests -android.bat update test-project -m .. -p . +call android.bat update test-project -m .. -p . cd .. From 154f038a40f84683d87d325799d822624ffb370b Mon Sep 17 00:00:00 2001 From: Luke Owncloud Date: Tue, 6 Aug 2013 14:42:42 +0200 Subject: [PATCH 4/4] added howto for Eclipse --- SETUP.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SETUP.md b/SETUP.md index ca7a25ab9f..8c1ebd9aa7 100644 --- a/SETUP.md +++ b/SETUP.md @@ -15,11 +15,13 @@ 3. Building with eclipse: - - TODO: FIX / MORE DETAILS - - Run "ant clean debug" - - Open Eclipse and import *actionbarsherlock/library* project to your workspace - - NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh + - Open Eclipse and create new "Android Project from Existing Code". As root choose *actionbarsherlock/library* + - Increase Android API level until project compiles. 14 should work. bin/library.jar needs to be created! + - Import OwnCloud Android project. + - Increase Android API level to 17. + - Clean all projects. - After those actions you should be good to go. HAVE FUN! + - TODO: How to build for older devices? 4. Create pull request: