From: Luke Owncloud <owncloud@ohrt.org>
Date: Tue, 6 Aug 2013 09:19:30 +0000 (+0200)
Subject: added more detailed download and compile instructions.
X-Git-Tag: oc-android-1.4.6~12^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1b3c3a3ece9619d6010d3e2490e7067b392b1b47?hp=-c

added more detailed download and compile instructions.
fixed setup_env.bat
added target/ to .gitignore
---

1b3c3a3ece9619d6010d3e2490e7067b392b1b47
diff --git a/.gitignore b/.gitignore
index 0105cb34..63b41a52 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 d527d4fe..692c8c46 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 c0bfeb4f..c13edca2 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