Merge branch 'ptp_9_1'
Change-Id: Ie6dc53cbfed0e2bfa56fcd09060bb34dac267dc8
Signed-off-by: Greg Watson <g.watson@computer.org>
diff --git a/pom.xml b/pom.xml
index 224f95c..dbe45e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,9 @@
<name>PTP Parent</name>
<properties>
- <ptp-version>9.1.2</ptp-version>
- <eclipse-release>neon</eclipse-release>
+ <ptp-version>nightly</ptp-version>
+ <remote-version>nightly</remote-version>
+ <eclipse-release>oxygen</eclipse-release>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5</help-docs-eclipserun-repo>
@@ -200,7 +201,7 @@
<groupId>org.eclipse.ptp</groupId>
<artifactId>org.eclipse.ptp.target</artifactId>
<version>9.1.2-SNAPSHOT</version>
- <classifier>neon</classifier>
+ <classifier>oxygen</classifier>
</artifact>
</target>
</configuration>
diff --git a/releng/org.eclipse.ptp.target/mars.target b/releng/org.eclipse.ptp.target/mars.target
index c848db9..edde8a4 100644
--- a/releng/org.eclipse.ptp.target/mars.target
+++ b/releng/org.eclipse.ptp.target/mars.target
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="mars" sequenceNumber="0">
+<?pde version="3.8"?><target name="ptp-mars" sequenceNumber="0">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/releng/org.eclipse.ptp.target/neon.target b/releng/org.eclipse.ptp.target/neon.target
index 6753157..4c1afd6 100644
--- a/releng/org.eclipse.ptp.target/neon.target
+++ b/releng/org.eclipse.ptp.target/neon.target
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="neon" sequenceNumber="17">
+<?pde version="3.8"?><target name="ptp-neon" sequenceNumber="17">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.ptp.target/oxygen.target b/releng/org.eclipse.ptp.target/oxygen.target
new file mode 100644
index 0000000..3f99d61
--- /dev/null
+++ b/releng/org.eclipse.ptp.target/oxygen.target
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="ptp-oxygen" sequenceNumber="18">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/cdt/launchbar/neon.2/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.gson" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20161205183421/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" 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>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/egit/updates-nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" 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/nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.control.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tm.terminal.view.sdk.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.photran.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.photran.intel.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.photran.xlf.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.core.parser.upc.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
+</location>
+</locations>
+</target>
diff --git a/releng/org.eclipse.ptp.target/pom.xml b/releng/org.eclipse.ptp.target/pom.xml
index bc6195e..8fdb1ac 100644
--- a/releng/org.eclipse.ptp.target/pom.xml
+++ b/releng/org.eclipse.ptp.target/pom.xml
@@ -30,9 +30,9 @@
<configuration>
<artifacts>
<artifact>
- <file>neon.target</file>
+ <file>oxygen.target</file>
<type>target</type>
- <classifier>neon</classifier>
+ <classifier>ptp-oxygen</classifier>
</artifact>
</artifacts>
</configuration>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.configs/data/openmpi-generic-interactive.xml b/rms/org.eclipse.ptp.rm.jaxb.configs/data/openmpi-generic-interactive.xml
index 55092c8..2293c7a 100644
--- a/rms/org.eclipse.ptp.rm.jaxb.configs/data/openmpi-generic-interactive.xml
+++ b/rms/org.eclipse.ptp.rm.jaxb.configs/data/openmpi-generic-interactive.xml
@@ -13,6 +13,7 @@
name="Generic Open MPI Interactive">
<control-data>
<attribute name="ompi_minor_version" visible="false" type="integer"/>
+ <attribute name="ompi_major_version" visible="false" type="integer"/>
<attribute name="local_prefix" visible="false" type="string">
<default></default>
</attribute>
@@ -85,17 +86,41 @@
</target>
<target>
<match>
- <expression>ompi:version:full:[\d]+\.([\d]+).*</expression>
+ <expression>ompi:version:full:([\d]+)\.([\d]+).*</expression>
<set field="name">
- <entry value="ompi_minor_version"/>
+ <entry value="ompi_major_version"/>
</set>
<set field="value">
<entry valueGroup="1"/>
</set>
+ <set field="name">
+ <entry value="ompi_minor_version" forceNewObject="true"/>
+ </set>
+ <set field="value">
+ <entry valueGroup="2"/>
+ </set>
</match>
- <test op="LT">
- <value>#value</value>
- <value>3</value>
+ <test op="AND">
+ <test op="AND">
+ <test op="EQ">
+ <value>#name</value>
+ <value>ompi_major_version</value>
+ </test>
+ <test op="EQ">
+ <value>#value</value>
+ <value>1</value>
+ </test>
+ </test>
+ <test op="AND">
+ <test op="EQ">
+ <value>#name</value>
+ <value>ompi_minor_version</value>
+ </test>
+ <test op="LT">
+ <value>#value</value>
+ <value>3</value>
+ </test>
+ </test>
<throw message="Only supports Open MPI 1.3 and later"/>
</test>
</target>
