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

Merge remote-tracking branch 'origin/master' into R3_0_maintenance

Change-Id: I8e903f621f30bc7bd64048825a542bb0aa47d033
Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson 2018-09-17 10:11:51 -04:00
commit 963f9fa93b
3 changed files with 29 additions and 4 deletions

View file

@ -16,7 +16,7 @@
<properties> <properties>
<remote-release>3.0.0</remote-release> <remote-release>3.0.0</remote-release>
<tycho-version>0.26.0</tycho-version> <tycho-version>1.1.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version> <tycho-extras-version>${tycho-version}</tycho-extras-version>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/ptp/org.eclipse.remote.git</tycho.scmUrl>
<platform-version>4.5</platform-version> <platform-version>4.5</platform-version>
@ -162,7 +162,7 @@
<groupId>org.eclipse.remote</groupId> <groupId>org.eclipse.remote</groupId>
<artifactId>org.eclipse.remote.target</artifactId> <artifactId>org.eclipse.remote.target</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.0.0-SNAPSHOT</version>
<classifier>oxygen</classifier> <classifier>photon</classifier>
</artifact> </artifact>
</target> </target>
</configuration> </configuration>

View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="remote-photon" sequenceNumber="1">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.8/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.cdt.core" version="0.0.0"/>
<unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
</location>
</locations>
</target>

View file

@ -30,9 +30,9 @@
<configuration> <configuration>
<artifacts> <artifacts>
<artifact> <artifact>
<file>oxygen.target</file> <file>photon.target</file>
<type>target</type> <type>target</type>
<classifier>remote-oxygen</classifier> <classifier>remote-photon</classifier>
</artifact> </artifact>
</artifacts> </artifacts>
</configuration> </configuration>