Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorAbel Hegedus2017-03-09 13:39:18 +0000
committerAbel Hegedus2017-03-09 13:41:49 +0000
commit95534cb4332c395cc765afa896ef43c166ab68f8 (patch)
tree4e33a647ed431c9b38bccf67d1a054c43ef5dbda /releng
parentb805fe022570443be3da7c7666ade17bd318cb39 (diff)
downloadorg.eclipse.emf.diffmerge.core-95534cb4332c395cc765afa896ef43c166ab68f8.tar.gz
org.eclipse.emf.diffmerge.core-95534cb4332c395cc765afa896ef43c166ab68f8.tar.xz
org.eclipse.emf.diffmerge.core-95534cb4332c395cc765afa896ef43c166ab68f8.zip
[513302] add model patch setup to EDM setup
I have also updated the identifier of the git clone task to be unique Bug: 513302 Change-Id: I19f4822522bc58d3aaf7fdf1a8a6045a8bf3d02c Signed-off-by: Abel Hegedus <abel.hegedus@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup17
1 files changed, 13 insertions, 4 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup b/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup
index 3044ccab..af5b383a 100644
--- a/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup
+++ b/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup
@@ -46,7 +46,7 @@
</setupTask>
<setupTask
xsi:type="git:GitCloneTask"
- id="git.clone"
+ id="git.clone.edm.core"
remoteURI="diffmerge/org.eclipse.emf.diffmerge.core">
<annotation
source="http://www.eclipse.org/oomph/setup/InducedChoices">
@@ -75,7 +75,7 @@
<requirement
name="org.eclipse.sdk.feature.group"/>
<sourceLocator
- rootFolder="${git.clone.location}"
+ rootFolder="${git.clone.edm.core.location}"
locateNestedProjects="true"/>
<repositoryList
name="Mars">
@@ -115,7 +115,7 @@
<requirement
name="com.windowtester.ide.feature.group"/>
<sourceLocator
- rootFolder="${git.clone.location}"
+ rootFolder="${git.clone.edm.core.location}"
locateNestedProjects="true"/>
<repositoryList
name="Mars">
@@ -194,8 +194,17 @@
</predicate>
</workingSet>
</setupTask>
+ <project href="https://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.patch.git/plain/releng/org.eclipse.emf.diffmerge.patch.setup/Modelpatch.setup#/"/>
<stream name="master"
- label="Master"/>
+ label="Master">
+ <setupTask
+ xsi:type="setup:EclipseIniTask"
+ option="-Doomph.redirection.edm.core"
+ value="=https://git.eclipse.org/c/diffmerge/org.eclipse.emf.diffmerge.git/plain/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup->${git.clone.edm.core.location|uri}/releng/org.eclipse.emf.diffmerge.releng/setup/EMFDiffMerge.setup"
+ vm="true">
+ <description></description>
+ </setupTask>
+ </stream>
<logicalProjectContainer
xsi:type="setup:ProjectCatalog"
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>

Back to the top