mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-21 21:52:10 +02:00
Build with 4.4 and use target definition file for maven build
Change-Id: I1044751c600e7725fd2cb02578c28d5f45de1854 Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/27631 Tested-by: Hudson CI Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
This commit is contained in:
parent
8c15651c03
commit
1cc6d6ab8e
9 changed files with 62 additions and 67 deletions
|
@ -37,6 +37,12 @@
|
|||
<include>**/AllAutotoolsTests.*</include>
|
||||
</includes>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||
<type>p2-installable-unit</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
|
@ -28,6 +28,12 @@
|
|||
<include>**/AllMakeUITests.*</include>
|
||||
</includes>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||
<type>p2-installable-unit</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
|
@ -28,6 +28,12 @@
|
|||
<include>**/AllManagedBuildUITests.*</include>
|
||||
</includes>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||
<type>p2-installable-unit</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
|
@ -29,6 +29,12 @@
|
|||
<include>**/AutomatedIntegrationSuite.*</include>
|
||||
</includes>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||
<type>p2-installable-unit</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
|
@ -45,11 +45,6 @@
|
|||
<ws>gtk</ws>
|
||||
<arch>ppc64</arch>
|
||||
</environment>
|
||||
<environment>
|
||||
<os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>ia64</arch>
|
||||
</environment>
|
||||
</environments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
71
pom.xml
71
pom.xml
|
@ -17,12 +17,6 @@
|
|||
<properties>
|
||||
<tycho-version>0.20.0</tycho-version>
|
||||
<tycho-extras-version>0.20.0</tycho-extras-version>
|
||||
<download-site>http://download.eclipse.org</download-site>
|
||||
<platform-site>${download-site}/eclipse/updates/${platform-version}</platform-site>
|
||||
<orbit-site>${download-site}/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site>
|
||||
<tm-site>${download-site}/tm/updates/${tm-version}</tm-site>
|
||||
<remote-site>${download-site}/tools/ptp/builds/remote/luna/nightly</remote-site>
|
||||
<license-site>${download-site}/cbi/updates/license</license-site>
|
||||
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
|
||||
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
|
||||
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
|
||||
|
@ -216,6 +210,7 @@
|
|||
<module>xlc/org.eclipse.cdt.core.lrparser.xlc.tests</module>
|
||||
<module>debug/org.eclipse.cdt.debug.ui.tests</module>
|
||||
-->
|
||||
<module>releng/org.eclipse.cdt.target</module>
|
||||
<module>releng/org.eclipse.cdt.testing</module>
|
||||
<module>releng/org.eclipse.cdt.testing-feature</module>
|
||||
<module>releng/org.eclipse.cdt.testing.repo</module>
|
||||
|
@ -223,34 +218,6 @@
|
|||
<module>releng/org.eclipse.cdt.repo</module>
|
||||
</modules>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>platform</id>
|
||||
<url>${platform-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>orbit</id>
|
||||
<url>${orbit-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>tm</id>
|
||||
<url>${tm-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>remote</id>
|
||||
<url>${remote-site}</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>license-feature</id>
|
||||
<url>${license-site}/</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>cbi</id>
|
||||
|
@ -259,32 +226,6 @@
|
|||
</pluginRepositories>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>platform-4.3</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>!platform-3.8</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<platform-version>4.3</platform-version>
|
||||
<orbit-version>R20130517111416</orbit-version>
|
||||
<tm-version>3.5</tm-version>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>platform-3.8</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>platform-3.8</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<platform-version>3.8</platform-version>
|
||||
<orbit-version>R20110523182458</orbit-version>
|
||||
<tm-version>3.3</tm-version>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>macosx</id>
|
||||
<activation>
|
||||
|
@ -445,6 +386,13 @@
|
|||
<arch>sparc</arch>
|
||||
</environment>
|
||||
</environments>
|
||||
<target>
|
||||
<artifact>
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>cdt-e4.4</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</artifact>
|
||||
</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
@ -577,11 +525,12 @@
|
|||
<type>eclipse-plugin</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<!-- This needs to be explicitely set now, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=395281 -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>platform</id>
|
||||
<layout>p2</layout>
|
||||
<url>${platform-site}</url>
|
||||
<url>http://download.eclipse.org/eclipse/updates/4.4milestones</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</configuration>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?pde version="3.8"?><target name="cdt_e4.4" sequenceNumber="15">
|
||||
<?pde version="3.8"?><target name="cdt_e4.4" sequenceNumber="16">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
|
||||
|
@ -32,6 +32,10 @@
|
|||
<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>
|
||||
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<launcherArgs>
|
||||
|
|
17
releng/org.eclipse.cdt.target/pom.xml
Normal file
17
releng/org.eclipse.cdt.target/pom.xml
Normal file
|
@ -0,0 +1,17 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<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>
|
||||
<groupId>org.eclipse.cdt</groupId>
|
||||
<artifactId>cdt-parent</artifactId>
|
||||
<version>8.4.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
</project>
|
|
@ -37,6 +37,12 @@
|
|||
<include>**/TestsRunnerSuite.*</include>
|
||||
</includes>
|
||||
<testFailureIgnore>true</testFailureIgnore>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||
<type>p2-installable-unit</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
|
Loading…
Add table
Reference in a new issue