Fix create_ddms_symlinks to create libs/ correctly.
Add git ignore files to avoid all build files from being submitted to git.
This commit is contained in:
1
tools/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
vendored
Normal file
1
tools/eclipse/plugins/com.android.ide.eclipse.adt/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.jar
|
||||
1
tools/eclipse/plugins/com.android.ide.eclipse.common/.gitignore
vendored
Normal file
1
tools/eclipse/plugins/com.android.ide.eclipse.common/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.jar
|
||||
31
tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/.gitignore
vendored
Normal file
31
tools/eclipse/plugins/com.android.ide.eclipse.ddms/icons/.gitignore
vendored
Normal file
@@ -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
|
||||
1
tools/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore
vendored
Normal file
1
tools/eclipse/plugins/com.android.ide.eclipse.ddms/libs/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.jar
|
||||
2
tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/.gitignore
vendored
Normal file
2
tools/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
ddmlib
|
||||
ddmuilib
|
||||
1
tools/eclipse/plugins/com.android.ide.eclipse.editors/.gitignore
vendored
Normal file
1
tools/eclipse/plugins/com.android.ide.eclipse.editors/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.jar
|
||||
1
tools/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore
vendored
Normal file
1
tools/eclipse/plugins/com.android.ide.eclipse.tests/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
*.jar
|
||||
@@ -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/
|
||||
|
||||
@@ -1,22 +1,30 @@
|
||||
#!/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
|
||||
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
|
||||
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
|
||||
chmod a+rx "$DEST/$JAR"
|
||||
fi
|
||||
else
|
||||
echo "Unsupported platform ($HOST). Nothing done."
|
||||
|
||||
Reference in New Issue
Block a user