[SCM] eclipse-linuxtools packaging branch, master, updated. upstream/0.10.0-17-g987405f

Jakub Adam jakub.adam at ktknet.cz
Sun Apr 22 16:18:49 UTC 2012


The following commit has been merged in the master branch:
commit 2683b1b134343b2697ec3c42ac0dc14c11b03586
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jan 1 17:58:25 2012 +0100

    Enable Valgrind integration

diff --git a/debian/control b/debian/control
index c50134a..863be29 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 8~),
                eclipse-pde (>= 3.7~exp),
                eclipse-cdt (>= 8.0.0),
                javahelper (>= 0.32~),
+               libswtchart-java,
                unzip,
                zip
 Standards-Version: 3.9.3
@@ -19,8 +20,7 @@ Depends: eclipse-cdt (>= 8.0.0),
          autoconf,
          automake,
          ${misc:Depends},
-         ${orbit:Depends},
-         ${shlibs:Depends}
+         ${orbit:Depends}
 Description: Autotools support for Eclipse CDT
  The Linux Distributions Autotools suite of plugins add support to
  the CDT (C/C++ Development Tools) for building and maintaining
@@ -43,3 +43,73 @@ Description: Autotools support for Eclipse CDT
     interface
   * Help for autoconf and automake
 
+Package: eclipse-cdt-valgrind
+Architecture: all
+Depends: eclipse-cdt,
+         valgrind,
+         ${misc:Depends},
+         ${orbit:Depends}
+Description: Valgrind integration for Eclipse CDT
+ The Linux Tools Project Valgrind plugin aims to provide simple and effective
+ profiling for the C/C++ Development Tools.
+ .
+ Integration of these tools from Valgrind suite is provided:
+ .
+  * Memcheck *
+ .
+ Memcheck is a tool that detects memory management problems. It is Valgrind's
+ most popular tool and seemingly the most mature. Memcheck's output is rather
+ straight forward - it is a series of errors along with stack trace information.
+ .
+ The Valgrind View presents this output using a TreeViewer with the errors as
+ top-level elements.
+ .
+ The stack trace is presented underneath the error and when a frame is
+ double-clicked an editor will open and go to the line in question.
+ .
+ Markers represent memcheck errors inside the editor and are linked to the
+ Problems View.
+ .
+ Includes an editor for Valgrind suppressions files featuring syntax
+ highlighting, folding and code completion.
+ .
+  * Massif *
+ .
+ Massif is a heap profiling tool. It takes several "snapshots" during execution
+ of your program detailing the various heap allocations throughout. It's output
+ for each snapshot primarily consists the time of the snapshot, how many bytes
+ were allocated that can be used, and how much extra was allocated than was
+ asked. The unit of time can be configured to be instructions, milliseconds or
+ bytes. At specified intervals, "detailed" snapshots are produced. These
+ detailed snapshots contain a tree of heap allocations that comprise that
+ snapshot. Unlike Memcheck, Massif does not yet support XML output. Massif's
+ output is complex and as such requires creative ways of displaying it. Valgrind
+ includes the ms_print program that is used to display Massif's output in a
+ visually appealing manner. ms_print was used as a template for how to display
+ this output.
+ .
+ The default view of the output is with a TableViewer. Snapshots are displayed
+ as tabular data, just as ms_print does.
+ .
+ For detailed snapshots, an icon indicates the snapshot can be double-clicked
+ and the View will display a TreeViewer of the detailed snapshots' heap
+ allocation trees.
+ .
+ ms_print also provides a bar chart of bytes allocated throughout execution. In
+ perhaps a more appropriate style, there is an option to display a detailed line
+ chart of this data.
+ .
+ * Cachegrind *
+ .
+ Cachegrind performs cache and branching profiling. A Cachegrind profile run
+ measures the number of cache misses and branch mispredictions performed by an
+ application. The results of a Cachegrind profile run are displayed in the
+ Valgrind view. These results show Cachegrind's cache/branch data in different
+ levels of granularity.
+ .
+ Double-clicking on any file, function, or line will open the corresponding
+ source file and place the cursor on the appropriate location (if the source can
+ be resolved).
+ .
+ Integration with the CDT's parsed code model provides a user interface that
+ resembles what you see in the Outline view.
diff --git a/debian/eclipse-cdt-valgrind.eh-install b/debian/eclipse-cdt-valgrind.eh-install
new file mode 100644
index 0000000..c4773c8
--- /dev/null
+++ b/debian/eclipse-cdt-valgrind.eh-install
@@ -0,0 +1,3 @@
+org.eclipse.linuxtools.tools.launch
+org.eclipse.linuxtools.profiling
+org.eclipse.linuxtools.valgrind
diff --git a/debian/eclipse-cdt-valgrind.lintian-overrides b/debian/eclipse-cdt-valgrind.lintian-overrides
new file mode 100644
index 0000000..2d84d75
--- /dev/null
+++ b/debian/eclipse-cdt-valgrind.lintian-overrides
@@ -0,0 +1 @@
+eclipse-cdt-valgrind: codeless-jar usr/share/eclipse/dropins/cdt-valgrind/eclipse/plugins/org.eclipse.linuxtools.valgrind.doc_*.jar
diff --git a/debian/eclipse.environment b/debian/eclipse.environment
index 39821d3..6d8f70b 100644
--- a/debian/eclipse.environment
+++ b/debian/eclipse.environment
@@ -1 +1,3 @@
 autotools/org.eclipse.linuxtools.cdt.autotools*
+profiling/org.eclipse.linuxtools*
+valgrind/org.eclipse.linuxtools.valgrind*
diff --git a/debian/eclipse.features b/debian/eclipse.features
index 4c6b664..cfde4dd 100644
--- a/debian/eclipse.features
+++ b/debian/eclipse.features
@@ -1 +1,4 @@
 org.eclipse.linuxtools.cdt.autotools cdt
+org.eclipse.linuxtools.tools.launch
+org.eclipse.linuxtools.profiling
+org.eclipse.linuxtools.valgrind cdt
diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps
new file mode 100644
index 0000000..88f955d
--- /dev/null
+++ b/debian/eclipse.orbitdeps
@@ -0,0 +1 @@
+org.swtchart
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0b81d75
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+valgrind-add-swtchart.patch
+valgrind-remove-unused-emf-dependency.patch
diff --git a/debian/patches/valgrind-add-swtchart.patch b/debian/patches/valgrind-add-swtchart.patch
new file mode 100644
index 0000000..0dd5b40
--- /dev/null
+++ b/debian/patches/valgrind-add-swtchart.patch
@@ -0,0 +1,24 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 21 Apr 2012 22:37:36 +0200
+Subject: valgrind-add-swtchart
+
+---
+ .../feature.xml                                    |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+index ecf9092..5e09bcb 100644
+--- a/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
++++ b/valgrind/org.eclipse.linuxtools.valgrind-feature/feature.xml
+@@ -111,4 +111,11 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
++   <plugin
++         id="org.swtchart"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
+ </feature>
diff --git a/debian/patches/valgrind-remove-unused-emf-dependency.patch b/debian/patches/valgrind-remove-unused-emf-dependency.patch
new file mode 100644
index 0000000..51e1bb5
--- /dev/null
+++ b/debian/patches/valgrind-remove-unused-emf-dependency.patch
@@ -0,0 +1,22 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 22 Apr 2012 00:16:49 +0200
+Subject: valgrind-remove-unused-emf-dependency
+
+---
+ .../META-INF/MANIFEST.MF                           |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+index 797081e..365c725 100644
+--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
++++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+@@ -18,9 +18,6 @@ Import-Package: org.eclipse.cdt.debug.core,
+  org.eclipse.debug.core.model,
+  org.eclipse.debug.core.sourcelookup,
+  org.eclipse.debug.ui,
+- org.eclipse.emf.common,
+- org.eclipse.emf.common.util,
+- org.eclipse.emf.ecore,
+  org.eclipse.jface.text,
+  org.eclipse.linuxtools.profiling.ui,
+  org.eclipse.linuxtools.valgrind.core,
diff --git a/debian/rules b/debian/rules
index c83b470..427482f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ BUILD_ID:=dist
 	dh $@ --with eclipse-helper
 
 override_jh_compilefeatures:
-	jh_compilefeatures --build-opts="-DjavacTarget=1.5 -DjavacSource=1.5 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
+	jh_compilefeatures --build-opts="-DjavacTarget=1.6 -DjavacSource=1.6 -DbuildId=$(BUILD_ID) -DforceContextQualifier=$(BUILD_ID)";
 
 # Directory changelog/ collides with dh_installchangelogs searching for upstream
 # logs and causes crash during build

-- 
eclipse-linuxtools packaging



More information about the pkg-java-commits mailing list