From: Jorge Antonio Diaz-Benito Soriano Date: Tue, 28 Oct 2014 15:13:10 +0000 (+0100) Subject: Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android... X-Git-Tag: oc-android-1.7.0_signed~69^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d7d4726929b09ad2dddd1e7ed3bb55c70c9b182d?hp=-c Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency Conflicts: setup_env.sh --- d7d4726929b09ad2dddd1e7ed3bb55c70c9b182d diff --combined setup_env.sh index 8c9af071,364d2739..e6047528 --- a/setup_env.sh +++ b/setup_env.sh @@@ -1,75 -1,75 +1,10 @@@ - #!/bin/bash -e - - - #Repository - ActionBarSherlockRepo="https://github.com/JakeWharton/ActionBarSherlock.git" - - #Directory for actionbarsherlock - DIRECTORY="actionbarsherlock" - - #Commit for version 4.2 of actionbar sherlock - COMMIT="90939dc3925ffaaa0de269bbbe1b35e274968ea1" - - - function initDefault { - git submodule init - git submodule update - android update lib-project -p owncloud-android-library - android update project -p . - android update project -p oc_jb_workaround - android update test-project -p tests -m .. - } - - function initForAnt { - #If the directory exists the script has already been executed - if [ ! -d "$DIRECTORY" ]; then - - #Gets the owncloud-android-library - git submodule init - git submodule update - - #Clones the actionbarsherlock and checks-out the right release (4.2.0) - git clone $ActionBarSherlockRepo $DIRECTORY - cd $DIRECTORY - git checkout $COMMIT - cd ../ - - #As default it updates the ant scripts - android update project -p "$DIRECTORY"/library -n ActionBarSherlock --target android-19 - android update lib-project -p owncloud-android-library - android update project -p . - android update project -p oc_jb_workaround - cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar - android update test-project -p tests -m .. - fi - } - - #No args - if [ $# -lt 1 ]; then - echo "No args found" - echo "Usage : $0 [gradle | maven | ant]" - exit - fi - - #checking args - case "$1" in - - "ant") - echo "Creating Ant environment" - initForAnt - ;; - - "gradle") echo "Creating gradle environment" - initDefault - ;; - - "maven") echo "Creating maven environment" - initDefault - ;; - - *) echo "Argument not recognized" - echo "Usage : $0 [gradle | maven | ant]" - ;; - esac - - exit + #!/bin/bash + - -#Repository -ActionBarSherlockRepo="https://github.com/JakeWharton/ActionBarSherlock.git" - -#Directory for actionbarsherlock -DIRECTORY="actionbarsherlock" - -#Commit for version 4.2 of actionbar sherlock -COMMIT="90939dc3925ffaaa0de269bbbe1b35e274968ea1" - - -function initDefault { - git submodule init - git submodule update - android update lib-project -p owncloud-android-library - android update project -p . - android update project -p oc_jb_workaround - android update test-project -p tests -m .. -} - -function initForAnt { - #If the directory exists the script has already been executed - if [ ! -d "$DIRECTORY" ]; then - - #Gets the owncloud-android-library - git submodule init - git submodule update - - #Clones the actionbarsherlock and checks-out the right release (4.2.0) - git clone $ActionBarSherlockRepo $DIRECTORY - cd $DIRECTORY - git checkout $COMMIT - cd ../ - - #As default it updates the ant scripts - android update project -p "$DIRECTORY"/library -n ActionBarSherlock --target android-19 - android update lib-project -p owncloud-android-library - android update project -p . - android update project -p oc_jb_workaround - cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar - android update test-project -p tests -m .. - fi -} - -#No args -if [ $# -lt 1 ]; then - echo "No args found" - echo "Usage : $0 [gradle | maven | ant]" - exit -fi - -#checking args -case "$1" in - - "ant") - echo "Creating Ant environment" - initForAnt - ;; - - "gradle") echo "Creating gradle environment" - initDefault - ;; - - "maven") echo "Creating maven environment" - initDefault - ;; - - *) echo "Argument not recognized" - echo "Usage : $0 [gradle | maven | ant]" - ;; -esac - -exit ++git submodule init ++git submodule update ++android update project -p actionbarsherlock/library -n ActionBarSherlock ++android update lib-project -p owncloud-android-library ++android update project -p . ++android update project -p oc_jb_workaround ++cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar ++android update test-project -p tests -m ..