From 2bd07a89caed5b9752ed595a09d870efe12005c1 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Tue, 4 Aug 2020 16:23:03 -0400
Subject: [PATCH] Bug 559674: Include only "primary" cmake.is support by
 default

The vendor specific support files need to be installed separately.
Includes changing the bundles display names to match the CMake main bundle
so that in the install wizard it is clear(er) what they work with.

Change-Id: I12ca155228e906c6c38fe37e37e8ce08d05a2452
---
 .../org.eclipse.cdt.cmake-feature/feature.xml | 35 --------------
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 .../plugin.properties                         |  2 +-
 releng/org.eclipse.cdt.repo/category.xml      | 46 ++++++++++++-------
 7 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/build/org.eclipse.cdt.cmake-feature/feature.xml b/build/org.eclipse.cdt.cmake-feature/feature.xml
index 251bdc311ea..b10d24468d6 100644
--- a/build/org.eclipse.cdt.cmake-feature/feature.xml
+++ b/build/org.eclipse.cdt.cmake-feature/feature.xml
@@ -42,13 +42,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.cmake.is.arm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.cdt.cmake.is.core"
          download-size="0"
@@ -69,32 +62,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.cmake.is.hpenonstop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.cmake.is.intel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.cmake.is.microsoft"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.cdt.cmake.is.nvidia"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties b/cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties
index ede599f7bd4..b48897a5f88 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.arm/plugin.properties
@@ -1,4 +1,4 @@
-bundleName=CDT indexer support for ARM C compilers
+bundleName=C/C++ CMake Build Support for ARM C compilers
 
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2019 Martin Weber\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties
index 8c2df4db5bc..fb0a1406c66 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/plugin.properties
@@ -1,4 +1,4 @@
-bundleName=CDT indexer support for HPE NonStop C/C++ compilers
+bundleName=C/C++ CMake Build Support for HPE NonStop C/C++ compilers
 
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2019 Martin Weber\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties b/cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties
index 459b0c9ecb5..3e3e72fd28c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.intel/plugin.properties
@@ -1,4 +1,4 @@
-bundleName=CDT indexer support for Intel C compilers
+bundleName=C/C++ CMake Build Support for Intel C compilers
 
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties b/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties
index cfa1d40a573..5737747859a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/plugin.properties
@@ -1,4 +1,4 @@
-bundleName=CDT indexer support for Microsoft cl C/C++ compiler
+bundleName=C/C++ CMake Build Support for Microsoft cl C/C++ compiler
 
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2020 Martin Weber\n\
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties b/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties
index db7ae532be7..d20589df984 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/plugin.properties
@@ -1,4 +1,4 @@
-bundleName=CDT indexer support for NVidia CUDA compilers
+bundleName=C/C++ CMake Build Support for NVidia CUDA compilers
 
 Bundle-Vendor = Eclipse CDT
 Bundle-Copyright = 2019 Martin Weber\n\
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 5e066e8b285..d9aa82f450c 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -144,22 +144,6 @@
    <feature id="org.eclipse.launchbar.remote.source">
       <category name="launchbar"/>
    </feature>
-   <iu id="org.eclipse.cdt.util" version="0.0.0"/>
-   <iu id="org.eclipse.cdt.util.source" version="0.0.0"/>
-   <iu id="org.eclipse.cdt.remote.core" version="0.0.0"/>
-   <iu id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
-   <iu id="javax.activation" version="0.0.0"/>
-   <iu id="javax.xml" version="0.0.0"/>
-   <iu id="javax.xml.bind" version="0.0.0"/>
-   <iu id="javax.xml.stream" version="0.0.0"/>
-   <iu id="com.google.gson" version="0.0.0"/>
-   <iu id="org.freemarker" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.core" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.ui" version="0.0.0"/>
-   <iu id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
    <feature id="org.eclipse.tm.terminal.control.feature">
       <category name="terminal_main"/>
    </feature>
@@ -208,6 +192,36 @@
    <feature id="org.eclipse.tm.terminal.feature.source">
       <category name="terminal_sdk"/>
    </feature>
+   <bundle id="org.eclipse.cdt.cmake.is.arm">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.arm.source">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.hpenonstop">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.hpenonstop.source">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.intel">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.intel.source">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.microsoft">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.microsoft.source">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.nvidia">
+      <category name="extra"/>
+   </bundle>
+   <bundle id="org.eclipse.cdt.cmake.is.nvidia.source">
+      <category name="extra"/>
+   </bundle>
    <category-def name="main" label="CDT Main Features"/>
    <category-def name="extra" label="CDT Optional Features"/>
    <category-def name="launchbar" label="LaunchBar"/>