[SCM] androidsdk-tools packaging branch, master, updated. bc99716d327d86f7a62fb4a762ed53d9287cd175

Sun Dec 23 21:43:49 UTC 2012

The following commit has been merged in the master branch:
commit bc99716d327d86f7a62fb4a762ed53d9287cd175
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Dec 23 21:50:59 2012 +0100

    Build traceview app

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-ddms-script-paths.patch b/debian/patches/fix-traceview-script-paths.patch
similarity index 55%
copy from debian/patches/fix-ddms-script-paths.patch
copy to debian/patches/fix-traceview-script-paths.patch
index e7e9523..55bf5ad 100644
--- a/debian/patches/fix-ddms-script-paths.patch
+++ b/debian/patches/fix-traceview-script-paths.patch
@@ -1,27 +1,28 @@
+From 15b77af5052722a3a8b2b9e03f81d100e0be0cab Mon Sep 17 00:00:00 2001
 From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Sat, 22 Dec 2012 21:46:13 +0100
-Subject: fix-ddms-script-paths
+Date: Sun, 23 Dec 2012 22:08:23 +0100
+Subject: [PATCH] fix-traceview-script-paths
 
 ---
- ddms/app/etc/ddms |   27 ++-------------------------
- 1 file changed, 2 insertions(+), 25 deletions(-)
+ traceview/etc/traceview |   28 +---------------------------
+ 1 file changed, 1 insertion(+), 27 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}"`
+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=ddms.jar
+ jarfile=traceview.jar
 -frameworkdir="$progdir"
 +frameworkdir="/usr/share/java"
  libdir="$progdir"
  if [ ! -r "$frameworkdir/$jarfile" ]
  then
-@@ -77,33 +77,10 @@ fi
+@@ -75,32 +75,6 @@ done
  
- jarpath="$frameworkdir/$jarfile:$frameworkdir/swtmenubar.jar"
+ jarpath="$frameworkdir/$jarfile"
  
 -# Figure out the path to the swt.jar for the current architecture.
 -# if ANDROID_SWT is defined, then just use this.
@@ -40,17 +41,18 @@ index d698ec3..8390aff 100755
 -    fi
 -fi
 -
--if [ ! -d "$swtpath" ]; then
+-# 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 DDMS is deprecated."
+ echo "The standalone version of traceview is deprecated."
  echo "Please use Android Device Monitor (tools/monitor) instead."
- exec "$javaCmd" \
-     -Xmx256M $os_opts $java_debug \
-     -Dcom.android.ddms.bindir="$progdir" \
--    -classpath "$jarpath:$swtpath/swt.jar" \
-+    -classpath "$jarpath" \
-     com.android.ddms.Main "$@"
+ 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

-- 
androidsdk-tools packaging

