2010-10-28 Francois Chouinard <fchouinard@gmail.com> Build dependencies fixes

diff --git a/org.eclipse.linuxtools.lttng-feature/feature.xml b/org.eclipse.linuxtools.lttng-feature/feature.xml
index 94a6b00b0f8341d55ba8636322b4808787738ccf..4b540dcb0504cfc571349bdbd21494455bd4b080 100644 (file)
--- a/org.eclipse.linuxtools.lttng-feature/feature.xml
+++ b/org.eclipse.linuxtools.lttng-feature/feature.xml
@@ -18,16 +18,21 @@
       %license
    </license>
 
+   <includes
+         id="org.eclipse.linuxtools.tmf"
+         version="0.0.0"
+         name="Tracing and Monitoring Framework (TMF) (Incubation)"/>
+
    <requires>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.linuxtools.tmf" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng" version="0.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.filesystem"/>
+      <import plugin="org.eclipse.linuxtools.tmf" version="0.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng.jni" version="0.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.tmf.ui" version="0.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.linuxtools.lttng" version="0.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index ea2f1b5016d3dbfd8f451a421d19995837658836..a14b12db3f0b5982f1f63f43cd6b2ec3b3296df8 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.core.filesystem,
  org.eclipse.core.runtime,
- org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
- org.eclipse.linuxtools.tmf.ui;bundle-version="0.2.0",
- org.eclipse.linuxtools.lttng;bundle-version="0.2.0"
+ org.eclipse.linuxtools.tmf;bundle-version="0.3.0",
+ org.eclipse.linuxtools.tmf.ui;bundle-version="0.3.0",
+ org.eclipse.linuxtools.lttng;bundle-version="0.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin

diff --git a/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF
index d7688982d5030d6993d0e9add2fe46bbce8eb1a5..cfd890cdbec16b28de813772f68c8864716d235a 100644 (file)
--- a/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-Version: 0.3.0.qualifier
 Bundle-Activator: org.eclipse.linuxtools.lttng.LTTngCorePlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.linuxtools.tmf;bundle-version="0.2.0",
- org.eclipse.linuxtools.lttng.jni;bundle-version="0.2.0"
+ org.eclipse.linuxtools.tmf;bundle-version="0.3.0",
+ org.eclipse.linuxtools.lttng.jni;bundle-version="0.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.linuxtools.lttng,