Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2012-05-16 14:12:00 -0400
committerJeff Johnston2012-05-16 14:12:00 -0400
commitb2906d2e87e10150b38f1de7397db89d719a91bd (patch)
tree223fc58f42267e514b995e1391f3c130a96c58d4
parent26a076a366bb7d739d5ef3ceb8d5754a98cbdf7f (diff)
downloadorg.eclipse.epp.packages-b2906d2e87e10150b38f1de7397db89d719a91bd.tar.gz
org.eclipse.epp.packages-b2906d2e87e10150b38f1de7397db89d719a91bd.tar.xz
org.eclipse.epp.packages-b2906d2e87e10150b38f1de7397db89d719a91bd.zip
In CPP feature, use p2.inf to optionally import Linux Tool features.
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/feature.xml67
-rw-r--r--packages/org.eclipse.epp.package.cpp.feature/p2.inf62
2 files changed, 63 insertions, 66 deletions
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index 7e27c588..121f29cf 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -19,72 +19,7 @@
<discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
</url>
- <!-- Optionally include the Linux Tools features -->
- <includes
- id="org.eclipse.linuxtools.cdt.libhover.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.changelog"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.gprof.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.oprofile.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.perf.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.rpm"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.rpm.ui.editor.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.systemtap"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.callgraph.feature"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.valgrind"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.gcov"
- version="0.0.0"
- optional="true"
- search-location="both"/>
- <includes
- id="org.eclipse.linuxtools.lttng"
- version="0.0.0"
- optional="true"
- search-location="both"/>
+ <!-- see p2.inf file for optionally imported Linux Tools features -->
<requires>
<import feature="org.eclipse.cvs"/>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index d19b4101..e8d611aa 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -7,5 +7,67 @@ requires.1.name=org.eclipse.platform.ide
#requires.1.range=[3.5.0.I20090522-1710,3.5.0.I20090522-1710]
requires.1.greedy=true
+# <import feature="org.eclipse.linuxtools.cdt.libhover.feature"/>
+requires.2.namespace=org.eclipse.equinox.p2.iu
+requires.2.name=org.eclipse.linuxtools.cdt.libhover.feature.feature.group
+requires.2.optional=true
+# <import feature="org.eclipse.linuxtools.cdt.libhover.devhelp.feature"/>
+requires.3.namespace=org.eclipse.equinox.p2.iu
+requires.3.name=org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group
+requires.3.optional=true
+# <import feature="org.eclipse.linuxtools.changelog"/>
+requires.4.namespace=org.eclipse.equinox.p2.iu
+requires.4.name=org.eclipse.linuxtools.changelog.feature.group
+requires.4.optional=true
+
+# <import feature="org.eclipse.linuxtools.gprof.feature"/>
+requires.5.namespace=org.eclipse.equinox.p2.iu
+requires.5.name=org.eclipse.linuxtools.gprof.feature.feature.group
+requires.5.optional=true
+
+# <import feature="org.eclipse.linuxtools.oprofile.feature"/>
+requires.6.namespace=org.eclipse.equinox.p2.iu
+requires.6.name=org.eclipse.linuxtools.oprofile.feature.feature.group
+requires.6.optional=true
+
+# <import feature="org.eclipse.linuxtools.perf.feature"/>
+requires.7.namespace=org.eclipse.equinox.p2.iu
+requires.7.name=org.eclipse.linuxtools.perf.feature.feature.group
+requires.7.optional=true
+
+# <import feature="org.eclipse.linuxtools.rpm"/>
+requires.8.namespace=org.eclipse.equinox.p2.iu
+requires.8.name=org.eclipse.linuxtools.rpm.feature.group
+requires.8.optional=true
+
+# <import feature="org.eclipse.linuxtools.rpm.ui.editor.feature"/>
+requires.9.namespace=org.eclipse.equinox.p2.iu
+requires.9.name=org.eclipse.linuxtools.rpm.ui.editor.feature.feature.group
+requires.9.optional=true
+
+# <import feature="org.eclipse.linuxtools.systemtap"/>
+requires.10.namespace=org.eclipse.equinox.p2.iu
+requires.10.name=org.eclipse.linuxtools.systemtap.feature.group
+requires.10.optional=true
+
+# <import feature="org.eclipse.linuxtools.callgraph.feature"/>
+requires.11.namespace=org.eclipse.equinox.p2.iu
+requires.11.name=org.eclipse.linuxtools.callgraph.feature.feature.group
+requires.11.optional=true
+
+# <import feature="org.eclipse.linuxtools.valgrind"/>
+requires.12.namespace=org.eclipse.equinox.p2.iu
+requires.12.name=org.eclipse.linuxtools.valgrind.feature.group
+requires.12.optional=true
+
+# <import feature="org.eclipse.linuxtools.gcov"/>
+requires.13.namespace=org.eclipse.equinox.p2.iu
+requires.13.name=org.eclipse.linuxtools.gcov.feature.group
+requires.13.optional=true
+
+# <import feature="org.eclipse.linuxtools.lttng"/>
+requires.14.namespace=org.eclipse.equinox.p2.iu
+requires.14.name=org.eclipse.linuxtools.lttng.feature.group
+requires.14.optional=true

Back to the top