mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Make it easier to use different target platforms in build

Browse source 
-Dtarget-platform can be used to specify which target to use.
For example, the default is target-platform=cdt-e4.4 but
-Dtarget-platform==cdt-e4.3 can also be used. The cdt.e4.3 target
file has been updated. Except the launchbar plugin doesn't compile
against 4.3 for now.

Change-Id: I6ce634f5567620d4f27a58ba0d711a3b87e617d1
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/30539
Reviewed-by: Alvaro Sanchez-Leon <alvsan09@gmail.com>
Tested-by: Hudson CI
This commit is contained in:
Marc-Andre Laperle 2014-07-25 17:18:39 -04:00
parent 74b4766793
commit c9785892f5
4 changed files with 77 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -21,6 +21,7 @@
<cdt-site>http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site> <cdt-site>http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath> <sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
<target-platform>cdt-e4.4</target-platform>
</properties> </properties>
<licenses> <licenses>
@ -406,7 +407,8 @@
<target> <target>
<artifact> <artifact>
<groupId>org.eclipse.cdt</groupId> <groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-e4.4</artifactId> <artifactId>org.eclipse.cdt.target</artifactId>
<classifier>${target-platform}</classifier>
<version>1.0.0</version> <version>1.0.0</version>
</artifact> </artifact>
</target> </target>

28
releng/org.eclipse.cdt.target/cdt-e4.3.target
View file

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="cdt_e4.3" sequenceNumber="13"> <target name="cdt_e4.3" sequenceNumber="14">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="8.1.11.201307080411"/> <unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/> <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="0.0.0"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="0.0.0"/>
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0.v201004271650"/> <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> <unit id="org.junit" version="0.0.0"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/> <unit id="org.junit.source" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@ -22,14 +22,22 @@
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/> <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<unit id="org.eclipse.rse.feature.group" version="0.0.0"/> <unit id="org.eclipse.rse.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/kepler"/> <repository location="http://download.eclipse.org/tm/updates/3.5"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<unit id="org.eclipse.test.feature.group" version="0.0.0"/> <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.3/"/> <repository location="http://download.eclipse.org/eclipse/updates/4.3/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/ptp/builds/8.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license/"/>
</location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<launcherArgs> <launcherArgs>

25
releng/org.eclipse.cdt.target/cdt-staging.target
View file

@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?><target name="cdt_staging" sequenceNumber="6">
<target name="cdt_staging" sequenceNumber="5">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="8.1.11.201307080411"/> <unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/> <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j" version="0.0.0"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.log4j.source" version="0.0.0"/>
<unit id="net.sourceforge.lpg.lpgjavaruntime" version="1.1.0.v201004271650"/> <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> <unit id="org.junit" version="0.0.0"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/> <unit id="org.junit.source" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@ -29,6 +28,14 @@
<unit id="org.eclipse.test.feature.group" version="0.0.0"/> <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.3/"/> <repository location="http://download.eclipse.org/eclipse/updates/4.3/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/ptp/builds/remote/luna/nightly/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/cbi/updates/license/"/>
</location>
</locations> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<launcherArgs> <launcherArgs>

45
releng/org.eclipse.cdt.target/pom.xml
View file

@ -3,15 +3,50 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-e4.4</artifactId>
<version>1.0.0</version>
<packaging>eclipse-target-definition</packaging>
<parent> <parent>
<groupId>org.eclipse.cdt</groupId> <groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId> <artifactId>cdt-parent</artifactId>
<version>8.5.0-SNAPSHOT</version> <version>8.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<groupId>org.eclipse.cdt</groupId>
<artifactId>org.eclipse.cdt.target</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>cdt-e4.4.target</file>
<type>target</type>
<classifier>cdt-e4.4</classifier>
</artifact>
<artifact>
<file>cdt-e4.3.target</file>
<type>target</type>
<classifier>cdt-e4.3</classifier>
</artifact>
<!-- More targets could be added here -->
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>