Skip to content

Commit

Permalink
Simplify the API baseline target
Browse files Browse the repository at this point in the history 
Also simplify the corresponding API baseline targlet in the setup

#39
  • Loading branch information
@merks
merks committed Aug 14, 2022
1 parent 9695d54 commit aab5f74
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 151 deletions.
79 changes: 26 additions & 53 deletions releng/CDT.setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@
activateTarget="false">
<targlet
name="${scope.project.label}"
activeRepositoryList="CDT Latest Released">
activeRepositoryList="CDT Latest Released"
includeSources="false"
includeAllPlatforms="true"
includeAllRequirements="false">
<requirement
name="org.eclipse.cdt.autotools.feature.group"/>
<requirement
Expand All @@ -109,97 +112,67 @@
<requirement
name="org.eclipse.cdt.docker.launcher.feature.group"/>
<requirement
name="org.eclipse.cdt.feature.group"/>
name="org.eclipse.cdt.examples.dsf.feature.group"/>
<requirement
name="org.eclipse.cdt.gdb.feature.group"/>
name="org.eclipse.cdt.gnu.multicorevisualizer.feature.group"/>
<requirement
name="org.eclipse.cdt.gnu.build.feature.group"/>
name="org.eclipse.cdt.jsoncdb.arm"/>
<requirement
name="org.eclipse.cdt.gnu.debug.feature.group"/>
name="org.eclipse.cdt.jsoncdb.hpenonstop"/>
<requirement
name="org.eclipse.cdt.gnu.dsf.feature.group"/>
name="org.eclipse.cdt.jsoncdb.intel"/>
<requirement
name="org.eclipse.cdt.gnu.multicorevisualizer.feature.group"/>
name="org.eclipse.cdt.jsoncdb.microsoft"/>
<requirement
name="org.eclipse.cdt.examples.dsf.feature.group"/>
name="org.eclipse.cdt.jsoncdb.nvidia"/>
<requirement
name="org.eclipse.cdt.launch.remote.feature.group"/>
<requirement
name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
<requirement
name="org.eclipse.cdt.llvm.dsf.lldb.feature.group"/>
<requirement
name="org.eclipse.cdt.lsp.feature.group"/>
<requirement
name="org.eclipse.cdt.managedbuilder.llvm.feature.group"/>
<requirement
name="org.eclipse.cdt.meson.feature.group"/>
<requirement
name="org.eclipse.cdt.msw.feature.group"/>
<requirement
name="org.eclipse.cdt.native.feature.group"/>
<requirement
name="org.eclipse.cdt.platform.feature.group"/>
<requirement
name="org.eclipse.cdt.qt.feature.group"/>
<requirement
name="org.eclipse.cdt.sdk.feature.group"/>
<requirement
name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
<requirement
name="org.eclipse.cdt.visualizer.feature.group"/>
name="org.eclipse.cdt.unittest.feature.feature.group"/>
<requirement
name="org.eclipse.cdt.util"/>
<requirement
name="org.eclipse.launchbar.feature.group"/>
name="org.eclipse.cdt.visualizer.feature.group"/>
<requirement
name="org.eclipse.launchbar.remote.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
name="org.eclipse.remote.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.local.feature.feature.group"/>
name="org.eclipse.remote.console.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.remote.feature.feature.group"/>
name="org.eclipse.remote.proxy.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.ssh.feature.feature.group"/>
name="org.eclipse.remote.serial.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.connector.telnet.feature.feature.group"/>
name="org.eclipse.remote.telnet.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.control.feature.feature.group"/>
name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.feature.feature.group"/>
name="org.eclipse.tm.terminal.connector.remote.feature.feature.group"/>
<requirement
name="org.eclipse.tm.terminal.view.feature.feature.group"/>
name="org.eclipse.tm.terminal.feature.feature.group"/>
<repositoryList
name="CDT Latest Released">
<repository
url="https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310"/>
<repository
url="https://download.eclipse.org/egit/updates-6.1/"/>
<repository
url="https://download.eclipse.org/linuxtools/update-docker-5.6.0/"/>
<repository
url="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
<repository
url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/"/>
<repository
url="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
<repository
url="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
<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>
OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0'
but it gets resolved here as we have CDT repo below.
</value>
</detail>
</annotation>
</repository>
<repository
url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
<repository
url="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09/"/>
url="https://download.eclipse.org/tools/cdt/releases/latest"/>
</repositoryList>
</targlet>
</setupTask>
Expand Down
143 changes: 45 additions & 98 deletions releng/org.eclipse.cdt.target/cdt-baseline.target
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,48 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt-baseline" sequenceNumber="33">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/egit/updates-6.1/"/>
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/linuxtools/update-docker-5.6.0/"/>
<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4e/releases/0.20.2/"/>
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tm4e/releases/0.4.3/"/>
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/"/>
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.core.autotools.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.dap.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.dap.gdbjtag.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.gdbjtag.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.standalone.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.ui.memory.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.docker.launcher.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gdb.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.build.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.debug.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.multicorevisualizer.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.examples.dsf.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.launch.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.launch.serial.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.llvm.dsf.lldb.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.managedbuilder.llvm.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.meson.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.msw.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.qt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.testsrunner.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.visualizer.feature.group" version="0.0.0"/>
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.ssh.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.telnet.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.xml.stream" version="0.0.0"/>
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
<unit id="org.antlr.runtime" version="0.0.0"/>
<unit id="org.apache.commons.compress" version="0.0.0"/>
<unit id="org.apache.log4j" version="0.0.0"/>
<unit id="org.assertj" version="0.0.0"/>
<unit id="org.freemarker" version="0.0.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.junit.jupiter.api" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
</location>
</locations>
<target name="cdt-baseline" sequenceNumber="34">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/releases/latest"/>
<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.core.autotools.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.dap.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.dap.gdbjtag.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.gdbjtag.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.standalone.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.debug.ui.memory.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.docker.launcher.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.examples.dsf.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.gnu.multicorevisualizer.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.jsoncdb.arm" version="0.0.0"/>
<unit id="org.eclipse.cdt.jsoncdb.hpenonstop" version="0.0.0"/>
<unit id="org.eclipse.cdt.jsoncdb.intel" version="0.0.0"/>
<unit id="org.eclipse.cdt.jsoncdb.microsoft" version="0.0.0"/>
<unit id="org.eclipse.cdt.jsoncdb.nvidia" version="0.0.0"/>
<unit id="org.eclipse.cdt.launch.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.launch.serial.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.llvm.dsf.lldb.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.lsp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.managedbuilder.llvm.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.meson.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.msw.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.qt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.testsrunner.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.unittest.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.util" version="0.0.0"/>
<unit id="org.eclipse.cdt.visualizer.feature.group" version="0.0.0"/>
<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.proxy.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
<unit id="org.eclipse.remote.telnet.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
</location>
</locations>
</target>

0 comments on commit aab5f74

Please sign in to comment.