Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2017-09-04 20:09:44 +0000
committerChristian W. Damus2017-09-04 21:09:42 +0000
commit6c3e2956fe89cacd8241c2023dae2b9d1e3f5b83 (patch)
treeb15f5202d153b4e01f6f1ae69166b51669579178 /org.eclipse.emf.compare-parent
parent8dcf0a73d45b992c11deed302bc032cede08e94a (diff)
downloadorg.eclipse.emf.compare-6c3e2956fe89cacd8241c2023dae2b9d1e3f5b83.tar.gz
org.eclipse.emf.compare-6c3e2956fe89cacd8241c2023dae2b9d1e3f5b83.tar.xz
org.eclipse.emf.compare-6c3e2956fe89cacd8241c2023dae2b9d1e3f5b83.zip
[521845] Fix Eclipse Platform requirement in Oxygen TP.
Ensure that the TP on Mac platform includes the binaries that the PDE's target resolution will attempt to chmod, to avert total failure of the target platform resolution. Bug: 521845 Change-Id: I2ab390f9a10b8a2c4ca9409e7906e617fe9606e4 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Diffstat (limited to 'org.eclipse.emf.compare-parent')
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target104
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target82
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd2
3 files changed, 94 insertions, 94 deletions
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
index 365b0526b..2b84ec20f 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare with extras based on Oxygen SDK" sequenceNumber="1502374703">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
- <repository location="http://download.eclipse.org/cbi/updates/license"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
- <unit id="org.junit" version="4.12.0.v201504281640"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="javaewah" version="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
- <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
- <unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/egit/updates"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
- <repository location="http://obeo.github.io/fr.obeo.performance/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius" version="0.0.0"/>
- <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
- <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="EMF Compare with extras based on Oxygen SDK" sequenceNumber="1504559326">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+ <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+ <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
+ <repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target
index 3bf552f18..6efcff29b 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Oxygen SDK" sequenceNumber="1500968636">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
- <repository location="http://download.eclipse.org/cbi/updates/license"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
- <unit id="org.junit" version="4.12.0.v201504281640"/>
- <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="javaewah" version="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
- <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
- <unit id="org.mockito" version="1.9.5.v201605172210"/>
- <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/egit/updates"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
- <repository location="http://obeo.github.io/fr.obeo.performance/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
- <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/oxygen"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="EMF Compare based on Oxygen SDK" sequenceNumber="1500968636">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
+ <unit id="org.mockito" version="1.9.5.v201605172210"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+ <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+ <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/oxygen"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
index 2e29fb4c9..82f992eb3 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
@@ -8,7 +8,7 @@ include "fragments/perf.tpd"
with source, requirements
location "http://download.eclipse.org/releases/oxygen" {
- org.eclipse.platform.sdk lazy
+ org.eclipse.platform.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
org.eclipse.uml2.feature.group lazy

Back to the top