mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 09:46:02 +02:00
Code Issues Wiki Activity

Upgrade to Tycho 0.14.1

Browse source
This commit is contained in:
Marc-Andre Laperle 2012-04-23 00:25:47 -04:00
parent 64ce186a2f
commit 68b6f3dc90
16 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/org.eclipse.cdt.autotools.docs/pom.xml
View file

@ -18,10 +18,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<!-- Change to groupId org.eclipse.tycho.extras after upgrade to Tycho 0.14 --> <groupId>org.eclipse.tycho.extras</groupId>
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-extras-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
<dependencies> <dependencies>

5
build/org.eclipse.cdt.autotools.tests/pom.xml
View file

@ -15,13 +15,14 @@
<artifactId>org.eclipse.cdt.autotools.tests</artifactId> <artifactId>org.eclipse.cdt.autotools.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <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> <repository>
<id>cdt.repo</id> <id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>-->
<build> <build>
<plugins> <plugins>

5
build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
View file

@ -15,13 +15,14 @@
<artifactId>org.eclipse.cdt.managedbuilder.core.tests</artifactId> <artifactId>org.eclipse.cdt.managedbuilder.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <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> <repository>
<id>cdt.repo</id> <id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>-->
<build> <build>
<plugins> <plugins>

5
core/org.eclipse.cdt.core.tests/pom.xml
View file

@ -15,13 +15,14 @@
<artifactId>org.eclipse.cdt.core.tests</artifactId> <artifactId>org.eclipse.cdt.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <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> <repository>
<id>cdt.repo</id> <id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>-->
<build> <build>
<plugins> <plugins>

5
core/org.eclipse.cdt.ui.tests/pom.xml
View file

@ -15,13 +15,14 @@
<artifactId>org.eclipse.cdt.ui.tests</artifactId> <artifactId>org.eclipse.cdt.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging> <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> <repository>
<id>cdt.repo</id> <id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>-->
<build> <build>
<plugins> <plugins>

4
cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml
View file

@ -4,9 +4,7 @@
label="%featureName" label="%featureName"
version="1.1.0.qualifier" version="1.1.0.qualifier"
provider-name="%providerName" provider-name="%providerName"
plugin="org.eclipse.cdt.build.crossgcc" plugin="org.eclipse.cdt.build.crossgcc">
license-feature="org.eclipse.cdt.license"
license-feature-version="1.0.0.qualifier">
<description> <description>
%description %description

4
cross/org.eclipse.cdt.launch.remote-feature/feature.xml
View file

@ -3,9 +3,7 @@
id="org.eclipse.cdt.launch.remote" id="org.eclipse.cdt.launch.remote"
label="%featureName" label="%featureName"
version="6.0.0.qualifier" version="6.0.0.qualifier"
provider-name="%providerName" provider-name="%providerName">
license-feature="org.eclipse.cdt.license"
license-feature-version="1.0.0.qualifier">
<description> <description>
%description %description

1
cross/org.eclipse.cdt.launch.remote/build.properties
View file

@ -18,7 +18,6 @@ bin.includes = META-INF/,\
about.ini,\ about.ini,\
about.mappings,\ about.mappings,\
about.properties,\ about.properties,\
eclipse32.png,\
plugin.properties,\ plugin.properties,\
plugin.xml,\ plugin.xml,\
remotecdt.html,\ remotecdt.html,\

5
doc/org.eclipse.cdt.doc.isv/pom.xml
View file

@ -32,10 +32,9 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 --> <groupId>org.eclipse.tycho.extras</groupId>
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-extras-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
<dependencies> <dependencies>

5
doc/org.eclipse.cdt.doc.user/pom.xml
View file

@ -32,10 +32,9 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 --> <groupId>org.eclipse.tycho.extras</groupId>
<groupId>com.google.code.tycho-eclipserun-plugin</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId> <artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-extras-version}</version>
<configuration> <configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
<dependencies> <dependencies>

4
jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
View file

@ -4,9 +4,7 @@
label="%featureName" label="%featureName"
version="7.0.0.qualifier" version="7.0.0.qualifier"
provider-name="%providerName" provider-name="%providerName"
image="eclipse_update_120.jpg" image="eclipse_update_120.jpg">
license-feature="org.eclipse.cdt.license"
license-feature-version="1.0.0.qualifier">
<description> <description>
%description %description

3
memory/org.eclipse.cdt.debug.ui.memory.search/build.properties
View file

@ -15,6 +15,5 @@ bin.includes = META-INF/,\
plugin.properties,\ plugin.properties,\
.,\ .,\
plugin.xml,\ plugin.xml,\
about.html,\ about.html
icons/
src.includes = about.html src.includes = about.html

3
pom.xml
View file

@ -15,7 +15,8 @@
<name>CDT Parent</name> <name>CDT Parent</name>
<properties> <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-version>3.8milestones</platform-version>
<platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site> <platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site>
<orbit-version>R20110523182458</orbit-version> <orbit-version>R20110523182458</orbit-version>

14
testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
View file

@ -15,16 +15,26 @@
<artifactId>org.eclipse.cdt.testsrunner.test</artifactId> <artifactId>org.eclipse.cdt.testsrunner.test</artifactId>
<packaging>eclipse-test-plugin</packaging> <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> <repository>
<id>cdt.repo</id> <id>cdt.repo</id>
<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
<layout>p2</layout> <layout>p2</layout>
</repository> </repository>
</repositories> </repositories>-->
<build> <build>
<plugins> <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> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId> <artifactId>tycho-surefire-plugin</artifactId>

4
upc/org.eclipse.cdt.bupc-feature/feature.xml
View file

@ -4,9 +4,7 @@
label="%featureName" label="%featureName"
version="1.0.3.qualifier" version="1.0.3.qualifier"
provider-name="%providerName" provider-name="%providerName"
plugin="org.eclipse.cdt.managedbuilder.bupc.ui" plugin="org.eclipse.cdt.managedbuilder.bupc.ui">
license-feature="org.eclipse.cdt.license"
license-feature-version="1.0.0.qualifier">
<description> <description>
%description %description

4
windows/org.eclipse.cdt.msw-feature/feature.xml
View file

@ -3,9 +3,7 @@
id="org.eclipse.cdt.msw" id="org.eclipse.cdt.msw"
label="CDT Visual C++ Support" label="CDT Visual C++ Support"
version="1.0.0.qualifier" version="1.0.0.qualifier"
provider-name="Eclipse CDT" provider-name="Eclipse CDT">
license-feature="org.eclipse.cdt.license"
license-feature-version="1.0.0.qualifier">
<description> <description>
%description %description