From: David A. Velasco Date: Mon, 28 Oct 2013 11:49:28 +0000 (+0100) Subject: Added name to build.xml for ActionBarSherlock and fixed calls to git in Windows X-Git-Tag: oc-android-1.5.5~140^2~12 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea26174440d1a1e3b16627dfd90b780c1fd87e1c?ds=inline;hp=-c Added name to build.xml for ActionBarSherlock and fixed calls to git in Windows --- ea26174440d1a1e3b16627dfd90b780c1fd87e1c diff --git a/setup_env.bat b/setup_env.bat index 3f34d184..30176009 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -1,6 +1,6 @@ -git submodule init -git submodule update -call android.bat update project -p actionbarsherlock\library +call git submodule init +call git submodule update +call android.bat update project -p actionbarsherlock\library -n ActionBarSherlock call android.bat update project -p . copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar call android.bat update test-project -p tests -m .. diff --git a/setup_env.sh b/setup_env.sh index 8c54319d..d64b46c2 100755 --- a/setup_env.sh +++ b/setup_env.sh @@ -2,7 +2,7 @@ git submodule init git submodule update -android update project -p actionbarsherlock/library +android update project -p actionbarsherlock/library -n ActionBarSherlock android update project -p . cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar android update test-project -p tests -m ..