mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-06 17:26:01 +02:00
Upgrade to Tycho 0.14.1
This commit is contained in:
Marc-Andre Laperle
parent
64ce186a2f
commit
68b6f3dc90
16 changed files with 38 additions and 38 deletions
|
|
@ -18,10 +18,9 @@
|
|||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<!-- Change to groupId org.eclipse.tycho.extras after upgrade to Tycho 0.14 -->
|
||||
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<version>${tycho-extras-version}</version>
|
||||
<configuration>
|
||||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@
|
|||
<artifactId>org.eclipse.cdt.autotools.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
<repositories>
|
||||
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
|
||||
<!-- <repositories>
|
||||
<repository>
|
||||
<id>cdt.repo</id>
|
||||
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>-->
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@
|
|||
<artifactId>org.eclipse.cdt.managedbuilder.core.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
<repositories>
|
||||
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
|
||||
<!-- <repositories>
|
||||
<repository>
|
||||
<id>cdt.repo</id>
|
||||
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>-->
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@
|
|||
<artifactId>org.eclipse.cdt.core.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
<repositories>
|
||||
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
|
||||
<!-- <repositories>
|
||||
<repository>
|
||||
<id>cdt.repo</id>
|
||||
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>-->
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,14 @@
|
|||
<artifactId>org.eclipse.cdt.ui.tests</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
<repositories>
|
||||
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
|
||||
<!-- <repositories>
|
||||
<repository>
|
||||
<id>cdt.repo</id>
|
||||
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>-->
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
label="%featureName"
|
||||
version="1.1.0.qualifier"
|
||||
provider-name="%providerName"
|
||||
plugin="org.eclipse.cdt.build.crossgcc"
|
||||
license-feature="org.eclipse.cdt.license"
|
||||
license-feature-version="1.0.0.qualifier">
|
||||
plugin="org.eclipse.cdt.build.crossgcc">
|
||||
|
||||
<description>
|
||||
%description
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
id="org.eclipse.cdt.launch.remote"
|
||||
label="%featureName"
|
||||
version="6.0.0.qualifier"
|
||||
provider-name="%providerName"
|
||||
license-feature="org.eclipse.cdt.license"
|
||||
license-feature-version="1.0.0.qualifier">
|
||||
provider-name="%providerName">
|
||||
|
||||
<description>
|
||||
%description
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ bin.includes = META-INF/,\
|
|||
about.ini,\
|
||||
about.mappings,\
|
||||
about.properties,\
|
||||
eclipse32.png,\
|
||||
plugin.properties,\
|
||||
plugin.xml,\
|
||||
remotecdt.html,\
|
||||
|
|
|
|||
|
|
@ -32,10 +32,9 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 -->
|
||||
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<version>${tycho-extras-version}</version>
|
||||
<configuration>
|
||||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -32,10 +32,9 @@
|
|||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 -->
|
||||
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-eclipserun-plugin</artifactId>
|
||||
<version>${tycho-version}</version>
|
||||
<version>${tycho-extras-version}</version>
|
||||
<configuration>
|
||||
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
|
||||
<dependencies>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
label="%featureName"
|
||||
version="7.0.0.qualifier"
|
||||
provider-name="%providerName"
|
||||
image="eclipse_update_120.jpg"
|
||||
license-feature="org.eclipse.cdt.license"
|
||||
license-feature-version="1.0.0.qualifier">
|
||||
image="eclipse_update_120.jpg">
|
||||
|
||||
<description>
|
||||
%description
|
||||
|
|
|
|||
|
|
@ -15,6 +15,5 @@ bin.includes = META-INF/,\
|
|||
plugin.properties,\
|
||||
.,\
|
||||
plugin.xml,\
|
||||
about.html,\
|
||||
icons/
|
||||
about.html
|
||||
src.includes = about.html
|
||||
|
|
|
|||
3
pom.xml
3
pom.xml
|
|
@ -15,7 +15,8 @@
|
|||
<name>CDT Parent</name>
|
||||
|
||||
<properties>
|
||||
<tycho-version>0.13.0</tycho-version>
|
||||
<tycho-version>0.14.1</tycho-version>
|
||||
<tycho-extras-version>0.14.0</tycho-extras-version>
|
||||
<platform-version>3.8milestones</platform-version>
|
||||
<platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site>
|
||||
<orbit-version>R20110523182458</orbit-version>
|
||||
|
|
|
|||
|
|
@ -15,16 +15,26 @@
|
|||
<artifactId>org.eclipse.cdt.testsrunner.test</artifactId>
|
||||
<packaging>eclipse-test-plugin</packaging>
|
||||
|
||||
<repositories>
|
||||
<!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
|
||||
<!-- <repositories>
|
||||
<repository>
|
||||
<id>cdt.repo</id>
|
||||
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
|
||||
<layout>p2</layout>
|
||||
</repository>
|
||||
</repositories>
|
||||
</repositories>-->
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- Not sure why but this is necessary since Tycho 0.14, perhaps this is a bug -->
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-surefire-plugin</artifactId>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
label="%featureName"
|
||||
version="1.0.3.qualifier"
|
||||
provider-name="%providerName"
|
||||
plugin="org.eclipse.cdt.managedbuilder.bupc.ui"
|
||||
license-feature="org.eclipse.cdt.license"
|
||||
license-feature-version="1.0.0.qualifier">
|
||||
plugin="org.eclipse.cdt.managedbuilder.bupc.ui">
|
||||
|
||||
<description>
|
||||
%description
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
id="org.eclipse.cdt.msw"
|
||||
label="CDT Visual C++ Support"
|
||||
version="1.0.0.qualifier"
|
||||
provider-name="Eclipse CDT"
|
||||
license-feature="org.eclipse.cdt.license"
|
||||
license-feature-version="1.0.0.qualifier">
|
||||
provider-name="Eclipse CDT">
|
||||
|
||||
<description>
|
||||
%description
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue