diff options
9 files changed, 63 insertions, 17 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore b/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore new file mode 100644 index 0000000..d392f0e --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.common/.gitignore b/eclipse/plugins/com.android.ide.eclipse.common/.gitignore new file mode 100644 index 0000000..d392f0e --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.common/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/icons/.gitignore b/eclipse/plugins/com.android.ide.eclipse.ddms/icons/.gitignore new file mode 100644 index 0000000..f432e88 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/icons/.gitignore @@ -0,0 +1,31 @@ +add.png +backward.png +clear.png +d.png +debug-attach.png +debug-error.png +debug-wait.png +delete.png +device.png +down.png +e.png +edit.png +empty.png +emulator.png +forward.png +gc.png +halt.png +heap.png +i.png +importBug.png +load.png +pause.png +play.png +pull.png +push.png +save.png +thread.png +up.png +v.png +w.png +warning.png diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore b/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore new file mode 100644 index 0000000..d392f0e --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/.gitignore b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/.gitignore new file mode 100644 index 0000000..76d9981 --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/.gitignore @@ -0,0 +1,2 @@ +ddmlib +ddmuilib diff --git a/eclipse/plugins/com.android.ide.eclipse.editors/.gitignore b/eclipse/plugins/com.android.ide.eclipse.editors/.gitignore new file mode 100644 index 0000000..d392f0e --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.editors/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore b/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore new file mode 100644 index 0000000..d392f0e --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore @@ -0,0 +1 @@ +*.jar diff --git a/eclipse/scripts/create_ddms_symlinks.sh b/eclipse/scripts/create_ddms_symlinks.sh index 6c24216..795882b 100755 --- a/eclipse/scripts/create_ddms_symlinks.sh +++ b/eclipse/scripts/create_ddms_symlinks.sh @@ -24,7 +24,7 @@ function back() { BASE="development/tools/eclipse/plugins/com.android.ide.eclipse.ddms" DEST=$BASE/libs -mkdir -p $D +mkdir -p $DEST BACK=`back $DEST` for i in prebuilt/common/jfreechart/*.jar; do $CMD $BACK/$i $DEST/ diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh index 110539a..685d4e0 100755 --- a/eclipse/scripts/create_test_symlinks.sh +++ b/eclipse/scripts/create_test_symlinks.sh @@ -1,24 +1,32 @@ #!/bin/bash -cd ../plugins/com.android.ide.eclipse.tests + +# CD to the top android directory +D=`dirname "$0"` +cd "$D/../../../../" + +DEST="development/tools/eclipse/plugins/com.android.ide.eclipse.tests" +# computes "../.." from DEST to here (in /android) +BACK=`echo $DEST | sed 's@[^/]*@..@g'` + HOST=`uname` if [ "$HOST" == "Linux" ]; then - ln -svf ../../../../out/host/linux-x86/framework/kxml2-2.3.0.jar . + ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/" + elif [ "$HOST" == "Darwin" ]; then - ln -svf ../../../../out/host/darwin-x86/framework/kxml2-2.3.0.jar . + ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/" + elif [ "${HOST:0:6}" == "CYGWIN" ]; then - if [ "x$1" == "x" ]; then - echo "Usage: $0 <path to jars>" - echo "Argument 1 should be the path to the jars you want to copy. " - echo " e.g. android_sdk_windows_NNN/tools/lib/ " - echo "(since you can't rebuild them under Windows, you need prebuilt ones " - echo " from an SDK drop or a Linux/Mac)" - exit 1 - fi - if [ ! -f "kxml2-2.3.0.jar" ]; then - wget -O "kxml2-2.3.0.jar" "http://internap.dl.sourceforge.net/sourceforge/kxml/kxml2-2.3.0.jar" - chmod a+rx *.jar - fi + JAR="kxml2-2.3.0.jar" + if [ ! -f "$DEST/$JAR" ]; then + # Get the jar from ADT if we can, otherwise download it. + if [ -f "$DEST/../com.android.ide.eclipse.adt/$JAR" ]; then + cp "$DEST/../com.android.ide.eclipse.adt/$JAR" "$JAR" + else + wget -O "$DEST/$JAR" "http://internap.dl.sourceforge.net/sourceforge/kxml/$JAR" + fi + chmod a+rx "$DEST/$JAR" + fi else - echo "Unsupported platform ($HOST). Nothing done." + echo "Unsupported platform ($HOST). Nothing done." fi |