This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository androidsdk-tools.
commit bb940d7de820d3c972972735dff2fb3fec80cba9 Author: Jakub Adam <[email protected]> Date: Sun Oct 7 15:52:26 2012 +0200 Build ddms application --- debian/androidsdk-ddms.install | 3 ++ debian/androidsdk-ddms.links | 1 + debian/classpath | 1 + debian/control | 19 +++++++++++ debian/ddms.desktop | 7 ++++ debian/javabuild | 1 + debian/patches/fix-ddms-script-paths.patch | 54 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 9 ++++- 9 files changed, 95 insertions(+), 1 deletion(-) diff --git a/debian/androidsdk-ddms.install b/debian/androidsdk-ddms.install new file mode 100644 index 0000000..8f04ab3 --- /dev/null +++ b/debian/androidsdk-ddms.install @@ -0,0 +1,3 @@ +androidsdk-ddms.jar usr/share/java +ddms/app/etc/ddms usr/bin +debian/ddms.desktop usr/share/applications diff --git a/debian/androidsdk-ddms.links b/debian/androidsdk-ddms.links new file mode 100644 index 0000000..35c9df6 --- /dev/null +++ b/debian/androidsdk-ddms.links @@ -0,0 +1 @@ +usr/share/java/androidsdk-ddms.jar usr/share/java/ddms.jar diff --git a/debian/classpath b/debian/classpath index 88fe888..279bc2e 100644 --- a/debian/classpath +++ b/debian/classpath @@ -5,3 +5,4 @@ androidsdk-sdkstats.jar androidsdk-androidprefs.jar swt.jar androidsdk-swtmenubar.jar swt.jar androidsdk-ddmlib.jar . androidsdk-ddmuilib.jar androidsdk-ddmlib.jar jfreechart.jar jfreechart-swt.jar +androidsdk-ddms.jar androidsdk-ddmlib.jar androidsdk-ddmuilib.jar androidsdk-sdkstats.jar androidsdk-swtmenubar.jar org.eclipse.jface.jar diff --git a/debian/control b/debian/control index d0b4f60..6bb1303 100644 --- a/debian/control +++ b/debian/control @@ -72,3 +72,22 @@ Description: User interface library for ddmlib Android devices connected through USB or running in emulator. . This library provies UI components for use with ddmlib. + +Package: androidsdk-ddms +Section: java +Architecture: all +Depends: libandroidsdk-swtmenubar-java, libandroidsdk-ddmlib-java, + libandroidsdk-ddmuilib-java, ${java:Depends}, ${misc:Depends} +Description: Graphical debugging tool for Android + Dalvik Debug Monitor is a tool for debugging Android applications. Among + others, it provides these capabilities: + . + * Port-forwarding services. + * Screen capture on the device. + * Thread and heap information on the device. + * Logcat, process, and radio state information. + * Incoming call and SMS spoofing. + * Location data spoofing. + . + This package is required only when you want to run DDMS as a standalone + application. For usage from within Eclipse IDE, install eclipse-adt. diff --git a/debian/ddms.desktop b/debian/ddms.desktop new file mode 100644 index 0000000..ab7978d --- /dev/null +++ b/debian/ddms.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=Dalvik Debug Monitor +Icon=ddms +Exec=ddms +Terminal=false +Categories=Development;Debugger; diff --git a/debian/javabuild b/debian/javabuild index 147c220..e6c5631 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -5,3 +5,4 @@ androidsdk-sdkstats.jar sdkstats/src androidsdk-swtmenubar.jar swtmenubar/src androidsdk-ddmlib.jar ddms/libs/ddmlib/src androidsdk-ddmuilib.jar ddms/libs/ddmuilib/src +androidsdk-ddms.jar ddms/app/src diff --git a/debian/patches/fix-ddms-script-paths.patch b/debian/patches/fix-ddms-script-paths.patch new file mode 100644 index 0000000..0d1e41e --- /dev/null +++ b/debian/patches/fix-ddms-script-paths.patch @@ -0,0 +1,54 @@ +From: Jakub Adam <[email protected]> +Date: Sun, 7 Oct 2012 21:24:16 +0200 +Subject: fix-ddms-script-paths + +--- + ddms/app/etc/ddms | 27 ++------------------------- + 1 file changed, 2 insertions(+), 25 deletions(-) + +diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms +index d698ec3..8390aff 100755 +--- a/ddms/app/etc/ddms ++++ b/ddms/app/etc/ddms +@@ -34,7 +34,7 @@ prog="${progdir}"/`basename "${prog}"` + cd "${oldwd}" + + jarfile=ddms.jar +-frameworkdir="$progdir" ++frameworkdir="/usr/share/java" + libdir="$progdir" + if [ ! -r "$frameworkdir/$jarfile" ] + then +@@ -77,31 +77,8 @@ fi + + jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar" + +-# Figure out the path to the swt.jar for the current architecture. +-# if ANDROID_SWT is defined, then just use this. +-# else, if running in the Android source tree, then look for the correct swt folder in prebuilt +-# else, look for the correct swt folder in the SDK under tools/lib/ +-swtpath="" +-if [ -n "$ANDROID_SWT" ]; then +- swtpath="$ANDROID_SWT" +-else +- vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar` +- if [ -n "$ANDROID_BUILD_TOP" ]; then +- osname=`uname -s | tr A-Z a-z` +- swtpath="${ANDROID_BUILD_TOP}/prebuilts/tools/${osname}-${vmarch}/swt" +- else +- swtpath="${frameworkdir}/${vmarch}" +- fi +-fi +- +-if [ ! -d "$swtpath" ]; then +- echo "SWT folder '${swtpath}' does not exist." +- echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform." +- exit 1 +-fi +- + exec "$javaCmd" \ + -Xmx256M $os_opts $java_debug \ + -Dcom.android.ddms.bindir="$progdir" \ +- -classpath "$jarpath:$swtpath/swt.jar" \ ++ -classpath "$jarpath" \ + com.android.ddms.Main "$@" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..821ad6f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-ddms-script-paths.patch diff --git a/debian/rules b/debian/rules index f1b3246..6d8467b 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ ECLIPSE_JFACE_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.jface_*.j ECLIPSE_COMMANDS_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar) ECLIPSE_EQUINOX_COMMON_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar) -export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:androidsdk-ddmlib.jar:/usr/share/java/swt.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jfreechart-swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR):$(ECLIPSE_EQUINOX_COMMON_JAR) +export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:androidsdk-ddmlib.jar:androidsdk-ddmuilib.jar:androidsdk-sdkstats.jar:androidsdk-swtmenubar.jar:/usr/share/java/swt.jar:/usr/share/java/jfreechart.jar:/usr/share/java/jfreechart-swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR):$(ECLIPSE_EQUINOX_COMMON_JAR) common-post-build-indep:: for BNDFILE in debian/*.bnd; do \ @@ -15,3 +15,10 @@ common-post-build-indep:: done jar uf androidsdk-ddmuilib.jar -C ddms/libs/ddmuilib/src images + + jar uf androidsdk-ddms.jar -C ddms/app/src images + jh_manifest -m com.android.ddms.Main androidsdk-ddms.jar + +install/androidsdk-ddms:: + mkdir -p debian/androidsdk-ddms/usr/share/icons/hicolor/128x128/apps + cp ddms/app/src/images/ddms-128.png debian/androidsdk-ddms/usr/share/icons/hicolor/128x128/apps/ddms.png -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
