projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1b77e7f
)
tiny SETUP.md correction
author
Luke Owncloud
<owncloud@ohrt.org>
Thu, 27 Feb 2014 13:37:44 +0000
(14:37 +0100)
committer
Luke Owncloud
<owncloud@ohrt.org>
Thu, 27 Feb 2014 13:37:44 +0000
(14:37 +0100)
SETUP.md
patch
|
blob
|
blame
|
history
diff --git
a/SETUP.md
b/SETUP.md
index
12db83d
..
a965064
100644
(file)
--- a/
SETUP.md
+++ b/
SETUP.md
@@
-12,6
+12,7
@@
NOTE: You must have git in your environment path variable to perform the next op
* Pull changes from your develop branch: "git pull origin develop"
* Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git"
* Make sure to get the latest changes from official android/develop branch: "git pull upstream develop"
* Pull changes from your develop branch: "git pull origin develop"
* Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git"
* Make sure to get the latest changes from official android/develop branch: "git pull upstream develop"
+* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .
At this point you can continue using different tools to build the project. Section 2, 3 and 4 describe some of the existing alternatives.
At this point you can continue using different tools to build the project. Section 2, 3 and 4 describe some of the existing alternatives.
@@
-19,9
+20,8
@@
At this point you can continue using different tools to build the project. Secti
NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.
NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable.
-* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" .
* Run "ant clean" .
* Run "ant clean" .
-* Run "ant debug" to generate a debuggable version of the ownC
k
oud app.
+* Run "ant debug" to generate a debuggable version of the ownC
l
oud app.
### 3. Building with console/maven:
### 3. Building with console/maven: