remove now unused setup_env scripts

.travis.yml

@@ -10,6 +10,8 @@ android:
     - android-19
     - extra-android-m2repository
 script:
+  - git submodule init
+  - git submodule update
   - ./gradlew clean
   - ./gradlew build
   

SETUP.md

@@ -33,13 +33,13 @@ Next steps will assume you have a Github account and that you will get the code
 
 * In a web browser, go to https://github.com/owncloud/android, and click the 'Fork' button near the top right corner.
 * Open a terminal and go on with the next steps in it.
-* Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
+* Clone your forked repository: ```git clone --recursive git@github.com:YOURGITHUBNAME/android.git```.
 * Move to the project folder with ```cd android```.
 * Pull any changes from your remote branch 'master': ```git pull origin master```
 * 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/master branch: ```git pull upstream master```
 
-At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe the existing alternatives.
+At this point you can continue using different tools to build the project. Section 2 and 3 describe the existing alternatives.
 
 
 ### 2. Working with Android Studio.
@@ -50,9 +50,7 @@ We recommend to use the last version available in the stable channel of Android
 
 To set up the project in Android Studio follow the next steps:
 
-* Complete the setup of project properties running:
-    - Windows: ```setup_env.bat```
-    - Mac OS/Linux: ```./setup_env.sh```
+* Make sure you have called ```git submodule update``` whenever you switched branches
 * Open Android Studio and select 'Import Project (Eclipse ADT, Gradle, etc)'. Browse through your file system to the folder 'android' where the project is located. Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select 'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project.
 * Android Studio will try to build the project directly after importing it. To build it manually, follow the menu path 'Build'/'Make Project', or just click the 'Play' button in the tool bar to build and run it in a mobile device or an emulator. The resulting APK file will be saved in the 'build/outputs/apk/' subdirectory in the project folder.
 
@@ -62,9 +60,7 @@ To set up the project in Android Studio follow the next steps:
 [Gradle][7] is the build system used by Android Studio to manage the building operations on Android apps. You do not need to install Gradle in your system, and Google recommends not to do it, but instead trusting on the [Graddle wrapper][8] included in the project.
 
 * Open a terminal and go to the 'android' directory that contains the repository.
-* Complete the setup of project properties running:
-    - Windows: ```setup_env.bat```
-    - Mac OS/Linux: ```./setup_env.sh```
+* Make sure you have called ```git submodule update``` whenever you switched branches
 * Run the 'clean' and 'build' tasks using the Gradle wrapper provided
     - Windows: ```gradlew.bat clean build```
     - Mac OS/Linux: ```./gradlew clean build```
@@ -74,8 +70,6 @@ The first time the Gradle wrapper is called, the correct Gradle version will be
 The generated APK file is saved in android/build/outputs/apk as android-debug.apk
 
 
-### 4. Building in command line with maven:
-
 [0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md
 [1]: https://git-scm.com/
 [2]: https://git-scm.com/downloads

setup_env.bat

@@ -1,16 +0,0 @@
-@echo off
-
-:initForGradle
-echo "Creating development environment setup..."
-goto initDefault
-
-:initDefault
-call git submodule init
-call git submodule update
-goto complete
-
-:complete
-echo "...setup complete."
-goto exit
-
-:exit

setup_env.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-function initDefault {
-    git submodule init
-    git submodule update
-}
-
-echo  "Creating development environment setup..."
-initDefault
-echo "...setup complete."
-
-exit