From 4e40dda89f6e58d15b6e4aaf843cc4a2f1006966 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Fri, 12 Aug 2022 12:04:56 +0200
Subject: [PATCH] Improve CDT's setup

Include a configuration, simplify the targlet for the target platform,
and enhance the working sets based on folder structure.

https://github.com/eclipse-cdt/cdt/issues/39
---
 .../META-INF/MANIFEST.MF                      |   3 +-
 .../META-INF/MANIFEST.MF                      |   3 +-
 releng/CDT.setup                              | 312 ++++++++++++------
 releng/CDTConfiguration.setup                 |  50 +++
 4 files changed, 271 insertions(+), 97 deletions(-)
 create mode 100644 releng/CDTConfiguration.setup

diff --git a/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF
index 8f522bd1702..204d39b42fa 100644
--- a/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.application.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.cdt.debug.application,
  org.eclipse.cdt.core.native
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Import-Package: org.eclipse.cdt.utils.pty,
+Import-Package: org.apache.log4j;version="1.2.19",
+ org.eclipse.cdt.utils.pty,
  org.eclipse.core.resources,
  org.eclipse.debug.core
 Export-Package: org.eclipse.cdt.debug.application.tests;x-internal:=true
diff --git a/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
index 789df36a54b..aa458078b71 100644
--- a/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
+++ b/launchbar/org.eclipse.launchbar.ui.tests/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.launchbar.ui.controls.internal,
- org.junit.jupiter.api;version="5.8.1"
+ org.junit.jupiter.api;version="5.8.1",
+ org.slf4j
 Automatic-Module-Name: org.eclipse.launchbar.ui.tests
 Bundle-Localization: plugin
diff --git a/releng/CDT.setup b/releng/CDT.setup
index f1c8a142f72..5ce3156a4bc 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -11,9 +11,15 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
     name="cdt"
     label="CDT">
+  <annotation
+      source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
+    <reference
+        href="CDTConfiguration.setup#/"/>
+  </annotation>
   <setupTask
       xsi:type="setup.p2:P2Task">
     <requirement
@@ -236,57 +242,12 @@
         includeAllPlatforms="true">
       <requirement
           name="org.eclipse.license.feature.group"/>
-      <requirement
-          name="com.google.gson"/>
-      <requirement
-          name="com.sun.jna"
-          versionRange="5.8.0"/>
-      <requirement
-          name="com.sun.jna.platform"
-          versionRange="5.8.0"/>
-      <requirement
-          name="com.sun.xml.bind"
-          versionRange="2.3.3"/>
-      <requirement
-          name="jakarta.xml.bind"
-          versionRange="2.3.3"/>
-      <requirement
-          name="javax.activation"
-          versionRange="1.2.2"/>
-      <requirement
-          name="javax.xml.stream"/>
-      <requirement
-          name="net.sourceforge.lpg.lpgjavaruntime"/>
-      <requirement
-          name="org.antlr.runtime"/>
-      <requirement
-          name="org.apache.commons.compress"/>
-      <requirement
-          name="org.apache.log4j"/>
-      <requirement
-          name="org.assertj"/>
       <requirement
           name="org.eclipse.egit.feature.group"/>
       <requirement
           name="org.eclipse.equinox.executable.feature.group"/>
-      <requirement
-          name="org.eclipse.jdt.annotation"/>
-      <requirement
-          name="org.eclipse.launchbar.feature.group"/>
-      <requirement
-          name="org.eclipse.launchbar.remote.feature.group"/>
       <requirement
           name="org.eclipse.linuxtools.docker.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.lsp4e"/>
-      <requirement
-          name="org.eclipse.lsp4e.debug"/>
-      <requirement
-          name="org.eclipse.remote.console.feature.group"/>
-      <requirement
-          name="org.eclipse.remote.feature.group"/>
-      <requirement
-          name="org.eclipse.remote.serial.feature.group"/>
       <requirement
           name="org.eclipse.sdk.feature.group"/>
       <requirement
@@ -297,32 +258,8 @@
           name="org.eclipse.swtbot.feature.group"/>
       <requirement
           name="org.eclipse.test.feature.group"/>
-      <requirement
-          name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.tm.terminal.control"/>
-      <requirement
-          name="org.eclipse.tm.terminal.feature.feature.group"/>
       <requirement
           name="org.eclipse.tm4e.feature.feature.group"/>
-      <requirement
-          name="org.freemarker"/>
-      <requirement
-          name="org.hamcrest"/>
-      <requirement
-          name="org.hamcrest.core"/>
-      <requirement
-          name="org.junit"/>
-      <requirement
-          name="org.junit.jupiter.api"/>
-      <requirement
-          name="org.mockito"/>
-      <requirement
-          name="org.slf4j.impl.log4j12"/>
-      <requirement
-          name="org.yaml.snakeyaml"/>
-      <requirement
-          name="org.eclipse.unittest.ui"/>
       <requirement
           name="*"/>
       <sourceLocator
@@ -330,50 +267,235 @@
           locateNestedProjects="true"/>
       <repositoryList>
         <repository
-            url="https://download.eclipse.org/cbi/updates/license/"/>
+            url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.22/R-4.22-202111241800/"/>
+            url="https://download.eclipse.org/egit/updates-nightly"/>
         <repository
-            url="https://download.eclipse.org/egit/updates/"/>
+            url="https://download.eclipse.org/linuxtools/updates-docker-nightly"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+            url="https://download.eclipse.org/lsp4e/releases/latest"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
+            url="https://download.eclipse.org/tm4e/releases/latest"/>
         <repository
-            url="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
+            url="https://download.eclipse.org/tools/cdt/releases/latest"/>
         <repository
-            url="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository"/>
         <repository
-            url="https://download.eclipse.org/technology/swtbot/releases/3.1.0/"/>
-        <repository
-            url="https://download.eclipse.org/tm4e/releases/0.4.3/"/>
-        <repository
-            url="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/">
-          <annotation>
-            <detail
-                key="description">
-              <value>We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace.</value>
-            </detail>
-          </annotation>
-        </repository>
-        <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
         <repository
             url="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09"/>
         <repository
-            url="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
+            url="https://download.eclipse.org/technology/swtbot/releases/latest"/>
+        <repository
+            url="https://download.eclipse.org/wildwebdeveloper/releases/latest"/>
       </repositoryList>
     </targlet>
   </setupTask>
   <setupTask
-      xsi:type="setup.workingsets:WorkingSetTask">
+      xsi:type="setup.workingsets:WorkingSetTask"
+      id="cdt.workingsets">
     <workingSet
         name="CDT">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:RepositoryPredicate"
+            project="org.eclipse.cdt"/>
+        <operand
+            xsi:type="workingsets:ExclusionPredicate"
+            excludedWorkingSet="//'cdt.workingsets'/@workingSets[name='CDT%20%20Json%20CDB'] //'cdt.workingsets'/@workingSets[name='CDT%20%20JTag'] //'cdt.workingsets'/@workingSets[name='CDT%20%20Launch'] //'cdt.workingsets'/@workingSets[name='CDT%20%20Launchbar'] //'cdt.workingsets'/@workingSets[name='CDT%20%20Releng'] //'cdt.workingsets'/@workingSets[name='CDT%20%20Remote'] //'cdt.workingsets'/@workingSets[name='CDT%20%20Terminal'] //'cdt.workingsets'/@workingSets[name='CDT%20Build'] //'cdt.workingsets'/@workingSets[name='CDT%20CMake'] //'cdt.workingsets'/@workingSets[name='CDT%20Codan'] //'cdt.workingsets'/@workingSets[name='CDT%20Core'] //'cdt.workingsets'/@workingSets[name='CDT%20Cross'] //'cdt.workingsets'/@workingSets[name='CDT%20Debug'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF'] //'cdt.workingsets'/@workingSets[name='CDT%20DSF%20GDB'] //'cdt.workingsets'/@workingSets[name='CDT%20Doc'] //'cdt.workingsets'/@workingSets[name='CDT%20LLVM'] //'cdt.workingsets'/@workingSets[name='CDT%20LSP'] //'cdt.workingsets'/@workingSets[name='CDT%20Memory'] //'cdt.workingsets'/@workingSets[name='CDT%20Native'] //'cdt.workingsets'/@workingSets[name='CDT%20QT'] //'cdt.workingsets'/@workingSets[name='CDT%20Tests%20Runner'] //'cdt.workingsets'/@workingSets[name='CDT%20Tools%20Templates'] //'cdt.workingsets'/@workingSets[name='CDT%20Unit%20Test'] //'cdt.workingsets'/@workingSets[name='CDT%20Util'] //'cdt.workingsets'/@workingSets[name='CDT%20Visualizer'] //'cdt.workingsets'/@workingSets[name='CDT%20Windows']"/>
+      </predicate>
+    </workingSet>
+    <workingSet
+        name="CDT Build">
       <predicate
           xsi:type="predicates:RepositoryPredicate"
-          project="org.eclipse.cdt-feature"/>
+          project="org.eclipse.cdt"
+          relativePathPattern="build/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT CMake">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="cmake/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Codan">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="codan/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Core">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="core/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Cross">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="cross/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Debug">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="debug/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Doc">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="doc/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT DSF">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="dsf/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT DSF GDB">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="dsf-gdb/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Json CDB">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="jsoncdb/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  JTag">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="jtag/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Launch">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="launch/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Launchbar">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="launchbar/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT LLVM">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="lsp/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT LSP">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="llvm/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Memory">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="memory/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Native">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="native/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT QT">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="qt/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Releng">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="releng/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Remote">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="remote/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT  Terminal">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="terminal/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Tests Runner">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="testsrunner/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Tools Templates">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="tools\.templates/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Unit Test">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="unittest/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Util">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="util/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Visualizer">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="visualizer/.*"/>
+    </workingSet>
+    <workingSet
+        name="CDT Windows">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt"
+          relativePathPattern="windows/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
diff --git a/releng/CDTConfiguration.setup b/releng/CDTConfiguration.setup
new file mode 100644
index 00000000000..c040817b449
--- /dev/null
+++ b/releng/CDTConfiguration.setup
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Configuration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+    label="CDT">
+  <annotation
+      source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+    <detail
+        key="imageURI">
+      <value>https://www.eclipse.org/downloads/images/cdt.png</value>
+    </detail>
+    <detail
+        key="badgeLabel">
+      <value>CDT</value>
+    </detail>
+  </annotation>
+  <installation
+      name="cdt.installation"
+      label="CDT Installation">
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="installation.id.default"
+        value="cdt"/>
+    <productVersion
+        href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.products']/@products[name='epp.package.committers']/@versions[name='latest']"/>
+    <description>The CDT installation provides the latest tools needed to work with the Eclipse C/C++ Development Tools' source code.</description>
+  </installation>
+  <workspace
+      name="cdt.workspace"
+      label="CDT Workspace">
+    <stream
+        href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='cdt']/@streams[name='main']"/>
+    <description>The CDT workspace provides the source code of the Eclipse C/C++ Development Tools.</description>
+  </workspace>
+  <description>
+    &lt;p>
+    The &lt;a href=&quot;https://www.eclipse.org/cdt/&quot;/>Eclipse C/C++ Development Tools&lt;/a> configuration provisions a dedicated development environment 
+    for the complete set of source projects of the &lt;a href=&quot;https://projects.eclipse.org/projects/tools.cdt&quot;>CDT project&lt;/a>.
+    &lt;/p>
+    &lt;p>
+    All the source projects from &lt;a href=&quot;https://github.com/eclipse-cdt&quot;>CDT's Github Repositories&lt;/a>
+    are available, organized into working sets, and ready for contribution.
+    &lt;/p>
+    &lt;/p>
+    Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the analogous tutorial instructions&lt;/a> for the Eclipse Platform SDK's configuration for more details.
+    &lt;/p>
+  </description>
+</setup:Configuration>