This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository androidsdk-tools.
commit bc99716d327d86f7a62fb4a762ed53d9287cd175 Author: Jakub Adam <[email protected]> Date: Sun Dec 23 21:50:59 2012 +0100 Build traceview app --- debian/androidsdk-traceview.install | 3 ++ debian/androidsdk-traceview.links | 1 + debian/classpath | 1 + debian/control | 9 ++++ debian/javabuild | 1 + debian/patches/fix-traceview-script-paths.patch | 58 +++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++ 8 files changed, 77 insertions(+) diff --git a/debian/androidsdk-traceview.install b/debian/androidsdk-traceview.install new file mode 100644 index 0000000..6cfbee7 --- /dev/null +++ b/debian/androidsdk-traceview.install @@ -0,0 +1,3 @@ +androidsdk-traceview.jar usr/share/java +traceview/etc/traceview usr/bin +debian/traceview.desktop usr/share/applications diff --git a/debian/androidsdk-traceview.links b/debian/androidsdk-traceview.links new file mode 100644 index 0000000..a58d191 --- /dev/null +++ b/debian/androidsdk-traceview.links @@ -0,0 +1 @@ +usr/share/java/androidsdk-traceview.jar usr/share/java/traceview.jar diff --git a/debian/classpath b/debian/classpath index 1e529ac..da57d90 100644 --- a/debian/classpath +++ b/debian/classpath @@ -7,3 +7,4 @@ 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 androidsdk-hierarchyviewerlib.jar androidsdk-ddmlib.jar androidsdk-ddmuilib.jar org.eclipse.jface.jar swt.jar androidsdk-hierarchyviewer.jar androidsdk-hierarchyviewerlib.jar androidsdk-swtmenubar.jar androidsdk-common.jar +androidsdk-traceview.jar org.eclipse.jface.jar swt.jar diff --git a/debian/control b/debian/control index 5456253..3cf06f9 100644 --- a/debian/control +++ b/debian/control @@ -109,3 +109,12 @@ Description: Tool to debug and optimize Android user interface . This package is required only when you want to run DDMS as a standalone application. For usage from within Eclipse IDE, install eclipse-adt + +Package: androidsdk-traceview +Section: java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Description: Tool to profile performance of Android applications + Traceview is a graphical viewer for execution logs saved by your application. + It can help you debug your application and profile its performance. + diff --git a/debian/javabuild b/debian/javabuild index 78c432a..ca2f567 100644 --- a/debian/javabuild +++ b/debian/javabuild @@ -7,3 +7,4 @@ androidsdk-ddmuilib.jar ddms/libs/ddmuilib/src androidsdk-ddms.jar ddms/app/src androidsdk-hierarchyviewerlib.jar hierarchyviewer2/libs/hierarchyviewerlib/src androidsdk-hierarchyviewer.jar hierarchyviewer2/app/src +androidsdk-traceview.jar traceview/src diff --git a/debian/patches/fix-traceview-script-paths.patch b/debian/patches/fix-traceview-script-paths.patch new file mode 100644 index 0000000..55bf5ad --- /dev/null +++ b/debian/patches/fix-traceview-script-paths.patch @@ -0,0 +1,58 @@ +From 15b77af5052722a3a8b2b9e03f81d100e0be0cab Mon Sep 17 00:00:00 2001 +From: Jakub Adam <[email protected]> +Date: Sun, 23 Dec 2012 22:08:23 +0100 +Subject: [PATCH] fix-traceview-script-paths + +--- + traceview/etc/traceview | 28 +--------------------------- + 1 file changed, 1 insertion(+), 27 deletions(-) + +diff --git a/traceview/etc/traceview b/traceview/etc/traceview +index bf0bd3b..83a556c 100755 +--- a/traceview/etc/traceview ++++ b/traceview/etc/traceview +@@ -36,7 +36,7 @@ prog="${progdir}"/"${progname}" + cd "${oldwd}" + + jarfile=traceview.jar +-frameworkdir="$progdir" ++frameworkdir="/usr/share/java" + libdir="$progdir" + if [ ! -r "$frameworkdir/$jarfile" ] + then +@@ -75,32 +75,6 @@ done + + jarpath="$frameworkdir/$jarfile" + +-# 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 +- +-# Combine the swtpath and the framework dir path. +-if [ -d "$swtpath" ]; then +- frameworkdir="${swtpath}:${frameworkdir}" +-else +- 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 +- + echo "The standalone version of traceview is deprecated." + echo "Please use Android Device Monitor (tools/monitor) instead." + exec "${javaCmd}" $javaOpts -Djava.ext.dirs="$frameworkdir" -Dcom.android.traceview.toolsdir="$progdir" -jar "$jarpath" "$@" +-- +1.7.10.4 + diff --git a/debian/patches/series b/debian/patches/series index fa9590d..bf05091 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ fix-ddms-script-paths.patch fix-hierarchyviewer-script-paths.patch +fix-traceview-script-paths.patch diff --git a/debian/rules b/debian/rules index ad0a57e..c9b27b2 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,9 @@ common-post-build-indep:: jh_manifest -m com.android.hierarchyviewer.HierarchyViewerApplication androidsdk-hierarchyviewer.jar + jar uf androidsdk-traceview.jar -C traceview/src/resources icons + jh_manifest -m com.android.traceview.MainWindow androidsdk-traceview.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
