diff options
author | Bernd Hufmann | 2014-04-22 12:37:38 +0000 |
---|---|---|
committer | Bernd Hufmann | 2014-04-23 16:01:46 +0000 |
commit | b41c883dc414036438cdbe10438260091c6cbb4d (patch) | |
tree | f6cc64ef0f22f1d63638d8ff602340754edf835c | |
parent | 6b7454540c749f3d060fa0e6293d53f9c26969b6 (diff) | |
download | org.eclipse.linuxtools-b41c883dc414036438cdbe10438260091c6cbb4d.tar.gz org.eclipse.linuxtools-b41c883dc414036438cdbe10438260091c6cbb4d.tar.xz org.eclipse.linuxtools-b41c883dc414036438cdbe10438260091c6cbb4d.zip |
lttng-tmf: Update dependecies to new tmf.ctf feature
Change-Id: I3a9e8d544cfbc988704d15e891cdd92e736bebb6
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/25344
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
6 files changed, 8 insertions, 28 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml b/lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml index 9974a5d373..d3487eb3f9 100644 --- a/lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml +++ b/lttng/org.eclipse.linuxtools.lttng2.kernel/feature.xml @@ -25,19 +25,14 @@ </url> <includes - id="org.eclipse.linuxtools.tmf" - version="0.0.0" - name="Tracing and Monitoring Framework (TMF)"/> - - <includes id="org.eclipse.linuxtools.lttng2" version="0.0.0" name="Linux Tracing Toolkit next generation (LTTng)"/> <includes - id="org.eclipse.linuxtools.ctf" + id="org.eclipse.linuxtools.tmf.ctf" version="0.0.0" - name="Common Trace Format (CTF)"/> + name="CTF Support for TMF"/> <requires> <import plugin="org.eclipse.core.runtime"/> diff --git a/lttng/org.eclipse.linuxtools.lttng2.ust/feature.xml b/lttng/org.eclipse.linuxtools.lttng2.ust/feature.xml index 10314bea19..307618180c 100644 --- a/lttng/org.eclipse.linuxtools.lttng2.ust/feature.xml +++ b/lttng/org.eclipse.linuxtools.lttng2.ust/feature.xml @@ -25,19 +25,14 @@ </url> <includes - id="org.eclipse.linuxtools.tmf" - version="0.0.0" - name="Tracing and Monitoring Framework (TMF)"/> - - <includes id="org.eclipse.linuxtools.lttng2" version="0.0.0" name="Linux Tracing Toolkit next generation (LTTng)"/> <includes - id="org.eclipse.linuxtools.ctf" + id="org.eclipse.linuxtools.tmf.ctf" version="0.0.0" - name="Common Trace Format (CTF)"/> + name="CTF Support for TMF"/> <requires> <import plugin="org.eclipse.core.runtime"/> diff --git a/lttng/org.eclipse.linuxtools.lttng2/feature.xml b/lttng/org.eclipse.linuxtools.lttng2/feature.xml index 952466dc8a..bd19a1db10 100644 --- a/lttng/org.eclipse.linuxtools.lttng2/feature.xml +++ b/lttng/org.eclipse.linuxtools.lttng2/feature.xml @@ -24,14 +24,8 @@ </url> <includes - id="org.eclipse.linuxtools.tmf" - version="0.0.0" - name="Tracing and Monitoring Framework (TMF)"/> - - <includes - id="org.eclipse.linuxtools.ctf" - version="0.0.0" - name="Common Trace Format (CTF)"/> + id="org.eclipse.linuxtools.tmf.ctf" + version="0.0.0"/> <requires> <import plugin="org.eclipse.core.runtime"/> diff --git a/lttng/org.eclipse.linuxtools.tmf.ctf/feature.properties b/lttng/org.eclipse.linuxtools.tmf.ctf/feature.properties index f04cb459ac..4679cc793d 100644 --- a/lttng/org.eclipse.linuxtools.tmf.ctf/feature.properties +++ b/lttng/org.eclipse.linuxtools.tmf.ctf/feature.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2009, 2013 Ericsson +# Copyright (c) 2009, 2014 Ericsson # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 diff --git a/lttng/org.eclipse.linuxtools.tmf/feature.xml b/lttng/org.eclipse.linuxtools.tmf/feature.xml index cc034afa01..9a80cb935c 100644 --- a/lttng/org.eclipse.linuxtools.tmf/feature.xml +++ b/lttng/org.eclipse.linuxtools.tmf/feature.xml @@ -23,11 +23,6 @@ <update label="Linux Tools Update Site" url="http://download.eclipse.org/linuxtools/update"/> </url> - <includes - id="org.eclipse.linuxtools.ctf" - version="0.0.0" - name="Common Trace Format (CTF)"/> - <requires> <import plugin="org.eclipse.linuxtools.ctf.core" version="3.0.0" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime"/> diff --git a/lttng/org.eclipse.linuxtools.tracing.rcp.product/tracing.product b/lttng/org.eclipse.linuxtools.tracing.rcp.product/tracing.product index 12bc663e2c..078034a1a8 100644 --- a/lttng/org.eclipse.linuxtools.tracing.rcp.product/tracing.product +++ b/lttng/org.eclipse.linuxtools.tracing.rcp.product/tracing.product @@ -207,6 +207,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U <feature id="org.eclipse.rse.terminals"/> <feature id="org.eclipse.equinox.p2.extras.feature"/> <feature id="org.eclipse.linuxtools.ctf"/> + <feature id="org.eclipse.linuxtools.tmf.ctf"/> </features> <configurations> |