Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Schnekenburger2016-08-08 08:21:07 +0000
committerRemi Schnekenburger2016-08-13 15:10:21 +0000
commit00fbac340bb8b7dd5303b3172b101db83aed5985 (patch)
tree9b686a82129b66d33aea5ddb42fc3ce8a8f4c480 /releng/extra/targetPlatform
parentf454b60d48f2ce41a52b24108519e0caac18b43c (diff)
downloadorg.eclipse.papyrus-00fbac340bb8b7dd5303b3172b101db83aed5985.tar.gz
org.eclipse.papyrus-00fbac340bb8b7dd5303b3172b101db83aed5985.tar.xz
org.eclipse.papyrus-00fbac340bb8b7dd5303b3172b101db83aed5985.zip
Bug 485342: [Layout] Integrate ELK with Papyrus
This contribution works on the release 0.1 from ELK. It provides JUnit tests on ELK integration (mainly based on an export of the diagram using SVG export facility from Papyrus, and compare with a reference diagram). Conflicts: releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target Change-Id: Ife12dc26585091a8a5820e318e40011c173db479 Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Diffstat (limited to 'releng/extra/targetPlatform')
-rw-r--r--releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target6
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target6
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd9
3 files changed, 21 insertions, 0 deletions
diff --git a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
index d2c249c79db..79504ad75d6 100644
--- a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
+++ b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
@@ -151,6 +151,12 @@
<repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.elk.feature.feature.group" version="0.1.0.201607121925"/>
+ <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.1.0.201607121925"/>
+ <unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.1.0.201607121925"/>
+ <repository id="elk" location="file:/home/data/httpd/download.eclipse.org/elk/updates/releases/0.1.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="graphiti" location="file:/home/data/httpd/download.eclipse.org/graphiti/updates/0.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
index 5784cbc0f66..c9d52b46ab8 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
@@ -151,6 +151,12 @@
<repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.elk.feature.feature.group" version="0.1.0.201607121925"/>
+ <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.1.0.201607121925"/>
+ <unit id="org.eclipse.elk.gmf.feature.feature.group" version="0.1.0.201607121925"/>
+ <repository id="elk" location="http://download.eclipse.org/elk/updates/releases/0.1.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="graphiti" location="http://download.eclipse.org/graphiti/updates/0.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
index 1da3ed4d19e..e184bc9540c 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
@@ -72,6 +72,15 @@ location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.
org.eclipse.zest.layouts
}
+//manualUpdate
+
+location elk "http://download.eclipse.org/elk/updates/releases/0.1.0/" {
+ org.eclipse.elk.feature.feature.group
+ org.eclipse.elk.ui.feature.feature.group
+ org.eclipse.elk.gmf.feature.feature.group
+}
+
+
//Transitive dependencies
//updateFrom("Graphiti",0)

Back to the top