From a34423d36759abacc0f4731c8ddde9d583b97242 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Fri, 25 Oct 2013 14:50:28 +0200 Subject: [PATCH] Removed problematic target assignation in setup_env.bat, and improved setup of test project to avoid change of folders --- setup_env.bat | 8 +++----- setup_env.sh | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/setup_env.bat b/setup_env.bat index 85f45086..3f34d184 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -1,8 +1,6 @@ git submodule init git submodule update -call android.bat update project -p actionbarsherlock\library --target 1 -call android.bat update project -p . --target 1 +call android.bat update project -p actionbarsherlock\library +call android.bat update project -p . copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar -cd tests -call android.bat update test-project -m .. -p . -cd .. +call android.bat update test-project -p tests -m .. diff --git a/setup_env.sh b/setup_env.sh index 78babf13..8c54319d 100755 --- a/setup_env.sh +++ b/setup_env.sh @@ -5,5 +5,4 @@ git submodule update android update project -p actionbarsherlock/library android update project -p . cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar -cd tests -android update test-project -m .. -p . +android update test-project -p tests -m .. -- 2.11.0