1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-20 15:35:24 +02:00

Releng: Update to Tycho-0.23.1 for bz 459873, Unify Target Platforms

- Tycho-0.23 makes multiple Hudson builds in parallel more robust
- Use SWTbot-2.2.1 on Eclipse-3.8 to keep target dependencies clean
- Bring *.target files in sync with pom-config.xml for interactive use
- Align .gitignore with TCF's .gitignore

Change-Id: I6dfd7bfee43e8fcab1b6e7aae7a0b46f2f83bbf4
Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>
This commit is contained in:
Martin Oberhuber 2017-06-15 16:30:15 +02:00
parent ef6aeee516
commit fa298da8b7
5 changed files with 32 additions and 21 deletions

16
.gitignore vendored
View file

@ -1,11 +1,17 @@
bin/
target/
workspace/
debug-workspace/
# ignore various emacs droppings # ignore various emacs droppings
*~ *~
\#*\# \#*\#
# .
workspace
debug-workspace
# Ignored throughout the whole tree
bin/
target/
coverage/
artifacts/
/ManifestValidationResult.html
# MacOSX # MacOSX
.DS_Store .DS_Store

View file

@ -37,9 +37,11 @@
<properties> <properties>
<!-- Define version id's to be used in the plugins section --> <!-- Define version id's to be used in the plugins section -->
<!-- We stick to tycho-0.22 since it supports Java 7 for building --> <!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 -->
<!-- We cannot use tycho-0.25 or later since it doesn't support Java 7 for building -->
<!-- Using Java 8 for Tycho with a Java 7 target should be possible but takes some config -->
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference --> <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
<tycho-version>0.22.0</tycho-version> <tycho-version>0.23.1</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version> <tycho-extras-version>${tycho-version}</tycho-extras-version>
<maven-resources-version>2.7</maven-resources-version> <maven-resources-version>2.7</maven-resources-version>
<maven-antrun-version>1.8</maven-antrun-version> <maven-antrun-version>1.8</maven-antrun-version>
@ -59,11 +61,11 @@
<jacoco.output>file</jacoco.output> <jacoco.output>file</jacoco.output>
<jacoco.dumpOnExit>true</jacoco.dumpOnExit> <jacoco.dumpOnExit>true</jacoco.dumpOnExit>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
<terminal-stream>development</terminal-stream> <terminal-stream>development</terminal-stream>
<terminal-zipfile>${project.artifactId}.zip</terminal-zipfile> <terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
<terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install> <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
<sdk-version>4.7</sdk-version> <sdk-version>4.7</sdk-version>
<!-- Set up Mars as the default target platform to build against, --> <!-- Set up Mars as the default target platform to build against, -->
@ -76,9 +78,12 @@
<tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site> <tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site> <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site> <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
<!-- SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer --> <!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/</orbit-site> <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.5.0/</swtbot-site> <!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: -->
<!-- See http://wiki.eclipse.org/SWTBot/Releases -->
<!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer -->
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site>
</properties> </properties>
<repositories> <repositories>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Eclipse 3.8.x (Juno)" sequenceNumber="41"> <?pde version="3.8"?><target name="Terminals Eclipse 3.8.x (Juno)" sequenceNumber="47">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
@ -20,10 +20,10 @@
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/> <unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/> <unit id="org.eclipse.swtbot.forms.feature.group" version="2.2.1.201402241301"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/> <unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/> <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/> <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/>
@ -39,7 +39,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/> <unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.feature.group" version="2.0.0.201507010000"/> <unit id="org.eclipse.remote.feature.group" version="2.0.0.201507010000"/>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Eclipse 4.3.x (Kepler)" sequenceNumber="38"> <?pde version="3.8"?><target name="Terminals Eclipse 4.3.x (Kepler)" sequenceNumber="39">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Terminals Eclipse 4.7.x (Oxygen)" sequenceNumber="14"> <?pde version="3.8"?><target name="Terminals Eclipse 4.7.x (Oxygen)" sequenceNumber="27">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/> <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>