Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorZoltan Ujhelyi2017-03-02 13:52:02 +0000
committerZoltan Ujhelyi2017-03-04 11:36:28 +0000
commitd403aaec7ccd70d25261cb9f59b76f742c0e118c (patch)
treede0e2eacb3ee36c7502ce4f0c9c829e4ff50a302 /releng
parent83e0eeb6c047e7073dfe6c0c565e63927aef7d1f (diff)
downloadorg.eclipse.emf.diffmerge.core-d403aaec7ccd70d25261cb9f59b76f742c0e118c.tar.gz
org.eclipse.emf.diffmerge.core-d403aaec7ccd70d25261cb9f59b76f742c0e118c.tar.xz
org.eclipse.emf.diffmerge.core-d403aaec7ccd70d25261cb9f59b76f742c0e118c.zip
Integration of Sirius customization from Capella and releng update
Change-Id: I55640602e6e84a731b534057f1220ad9980e5f95 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com> Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml11
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target10
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/category.xml10
3 files changed, 20 insertions, 11 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index e3c4c581..97c8703a 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -19,7 +19,7 @@
<version>${tycho.version}</version>
<extensions>true</extensions>
</plugin>
-
+
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
@@ -62,6 +62,15 @@
</environments>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <labelSuffix xml:space="preserve"> with Sources</labelSuffix>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index c98dec86..9b7389c6 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="org.eclipse.emf.diffmerge" sequenceNumber="3">
+<?pde version="3.8"?><target includeMode="feature" name="org.eclipse.emf.diffmerge" sequenceNumber="6">
<locations>
<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.emf.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/mars"/>
</location>
@@ -12,5 +11,12 @@
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<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.sirius.runtime.feature.group" version="4.1.3.201701271300"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="4.1.3.201701271300"/>
+<unit id="org.eclipse.sirius.specifier.feature.group" version="4.1.3.201701271300"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="4.1.3.201701271300"/>
+<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.3/mars"/>
+</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.update/category.xml b/releng/org.eclipse.emf.diffmerge.update/category.xml
index 76a5b96b..abc81b7f 100644
--- a/releng/org.eclipse.emf.diffmerge.update/category.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -3,22 +3,16 @@
<feature url="features/org.eclipse.emf.diffmerge.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.scm.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.scm.feature" version="0.7.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.category"/>
- </feature>
<feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.tests.feature_0.1.0.qualifier.jar" id="org.eclipse.emf.diffmerge.tests.feature" version="0.1.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.7.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>

Back to the top