Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-02-28 04:04:30 +0000
committerAndrew Overholt2011-02-28 04:04:30 +0000
commitff15e0d153ab41fe1d00d581dacda71d3ae378cd (patch)
treeb56a7b2ecba3193ee41666156d14e357c661d017
parentdd9a627e65bf0e03db959b3ffb71c97fc2894c50 (diff)
parent666f038871d72610847ac187e3e1a2fd0a9b8dd1 (diff)
downloadorg.eclipse.linuxtools-ff15e0d153ab41fe1d00d581dacda71d3ae378cd.tar.gz
org.eclipse.linuxtools-ff15e0d153ab41fe1d00d581dacda71d3ae378cd.tar.xz
org.eclipse.linuxtools-ff15e0d153ab41fe1d00d581dacda71d3ae378cd.zip
Merge systemtap 0.6.2
Conflicts: systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog9
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml8
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/ChangeLog4
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF26
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog5
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF9
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph/ChangeLog5
-rw-r--r--systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF8
8 files changed, 60 insertions, 14 deletions
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
index 34fc183b02..fbb5185549 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-10 Jeff Johnston <jjohnstn@redhat.com>
+
+ * feature.xml: Put things back to just requiring the zest and draw2d plug-ins.
+
+2010-09-09 Jeff Johnston <jjohnstn@redhat.com>
+
+ * feature.xml: Add requirement for org.eclipse.zest as feature instead of plug-ins needed.
+ As well, require org.eclipse.draw2d feature instead of plug-in. Bump up version to 0.0.2.
+
2010-05-18 Andrew Overholt <overholt@redhat.com>
* feature.properties: Fix provider name.
diff --git a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
index d6c8e23496..2c91bbbbae 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.linuxtools.callgraph"
label="%featureName"
- version="0.0.1.qualifier"
+ version="0.0.2.qualifier"
provider-name="%featureProvider"
os="linux">
@@ -32,10 +32,10 @@
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.draw2d"/>
- <import plugin="org.eclipse.zest.layouts"/>
- <import plugin="org.eclipse.zest.core"/>
<import plugin="org.eclipse.core.filesystem"/>
+ <import plugin="org.eclipse.zest.core"/>
+ <import plugin="org.eclipse.zest.layouts"/>
+ <import plugin="org.eclipse.draw2d"/>
</requires>
<plugin
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/ChangeLog
new file mode 100644
index 0000000000..57d17ca1e4
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/ChangeLog
@@ -0,0 +1,4 @@
+2010-09-10 Jeff Johnston <jjohnstn@redhat.com>
+
+ * META-INF/MANIFEST.MF: Add zest plug-in dependencies rather than import packages
+ within them. \ No newline at end of file
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..b757735b58
--- /dev/null
+++ b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Sleepingthreads
+Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.genericzestdemo;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.linuxtools.sleepingthreads.Activator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.linuxtools.callgraph.core,
+ org.eclipse.zest.core;bundle-version="1.2.0",
+ org.eclipse.zest.layouts;bundle-version="1.1.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.cdt.core.model,
+ org.eclipse.core.commands.common,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.draw2d,
+ org.eclipse.jface.viewers,
+ org.eclipse.linuxtools.callgraph.launch,
+ org.eclipse.linuxtools.profiling.launch,
+ org.eclipse.swt,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui,
+ org.eclipse.ui.plugin
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog
index 5831001654..0eed51a609 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10 Jeff Johnston <jjohnstn@redhat.com>
+
+ * META-INF/MANIFEST.MF: Remove imported packages for zest and draw2d and instead require the
+ appropriate plug-ins that supply them.
+
2010-03-22 Roland Grunberg <rgrunber@redhat.com>
* src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java: Remove printline call.
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
index 3c86f4f56f..f5aef48e0a 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
@@ -8,12 +8,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.draw2d,
org.eclipse.linuxtools.callgraph;bundle-version="0.0.1",
- org.junit
+ org.junit,
+ org.eclipse.zest.core;bundle-version="1.2.0",
+ org.eclipse.zest.layouts;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.linuxtools.callgraph.core,
- org.eclipse.zest.core.widgets,
- org.eclipse.zest.layouts,
- org.eclipse.zest.layouts.algorithms
+ org.eclipse.linuxtools.callgraph.core
Bundle-Vendor: Eclipse
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
index 127eb8ac52..3f04a8cfbd 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
+++ b/systemtap/org.eclipse.linuxtools.callgraph/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10 Jeff Johnston <jjohnstn@redhat.com>
+
+ * META-INF/MANIFEST.MF: Add dependency on zest plug-ins rather than importing packages
+ within them.
+
2010-06-02 Roland Grunberg <rgrunber@redhat.com>
* plugin.properties: Externalize some strings in the Manifest.
diff --git a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
index ad4e5eebe9..3abc53c7f5 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Activator: org.eclipse.linuxtools.callgraph.CallgraphPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.draw2d,
- org.eclipse.zest.layouts
+ org.eclipse.zest.layouts;bundle-version="1.1.0",
+ org.eclipse.zest.core;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.linuxtools.callgraph,
@@ -15,9 +16,6 @@ Export-Package: org.eclipse.linuxtools.callgraph,
Import-Package: org.eclipse.cdt.core.model,
org.eclipse.jface.text,
org.eclipse.linuxtools.callgraph.core,
- org.eclipse.ui.texteditor,
- org.eclipse.zest.core.widgets,
- org.eclipse.zest.layouts,
- org.eclipse.zest.layouts.algorithms
+ org.eclipse.ui.texteditor
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin

Back to the top