Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2015-01-21 13:00:39 -0500
committerChristian W. Damus2015-01-21 13:00:56 -0500
commitc42dda4199efe4f677ce20e510a3eb80f38605a2 (patch)
treeac7284a440d2b90347559f2149ca21f1c0f87816
parentead8726b80b8bf69558b782bc8d9fd79a77ac244 (diff)
downloadorg.eclipse.papyrus-c42dda4199efe4f677ce20e510a3eb80f38605a2.tar.gz
org.eclipse.papyrus-c42dda4199efe4f677ce20e510a3eb80f38605a2.tar.xz
org.eclipse.papyrus-c42dda4199efe4f677ce20e510a3eb80f38605a2.zip
[Releng] Oomph setup fixes
Fix dependencies of RSA Migration component and reorganize importing of test plug-ins for Extra components to support new non-failing behaviour of Oomph.
-rw-r--r--releng/org.eclipse.papyrus.oomph/setups/papyrus.setup36
1 files changed, 8 insertions, 28 deletions
diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index 3c7b2a48905..8a8ca32a000 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -2019,6 +2019,8 @@
<sourceLocator
rootFolder="${papyrus.git.clone.location/extraplugins}/${papyrus.extraplugins.folder}"/>
<sourceLocator
+ rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
+ <sourceLocator
rootFolder="${papyrus.git.clone.location/features/papyrus-extra-features}">
<predicate
xsi:type="predicates:NamePredicate"
@@ -2098,11 +2100,6 @@
xsi:type="setup:VariableTask"
name="papyrus.extraplugins.folder"
value="cdo"/>
- <setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
- </setupTask>
<stream
name="master"
label="master (Mars/1.1)">
@@ -2180,11 +2177,6 @@
xsi:type="setup:VariableTask"
name="papyrus.extratestsfeature"
value="tests.extra.codegen.cpp"/>
- <setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
- </setupTask>
<stream
name="master"
label="master (Mars/1.1)">
@@ -2405,9 +2397,12 @@
name="papyrus.extraplugins.folder"
value="migration"/>
<setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
+ xsi:type="setup.targlets:TargletTask">
+ <targlet
+ name="Papyrus Model Migration Dependencies">
+ <requirement
+ name="org.eclipse.papyrus.umlrt"/>
+ </targlet>
</setupTask>
<stream
name="master"
@@ -2434,11 +2429,6 @@
xsi:type="setup:VariableTask"
name="papyrus.extraplugins.folder"
value="moka"/>
- <setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
- </setupTask>
<stream
name="master"
label="master (Mars/1.1)">
@@ -2522,11 +2512,6 @@
xsi:type="setup:VariableTask"
name="papyrus.extrafeature"
value="extra.uml.compare"/>
- <setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
- </setupTask>
<stream
name="master"
label="master (Mars/1.1)">
@@ -2581,11 +2566,6 @@
xsi:type="setup:VariableTask"
name="papyrus.extraplugins.folder"
value="umlrt"/>
- <setupTask
- xsi:type="projects:ProjectsImportTask">
- <sourceLocator
- rootFolder="${papyrus.git.clone.location/tests/junit/extraplugins}/${papyrus.extratests.folder}"/>
- </setupTask>
<stream
name="master"
label="master (Mars/1.1)">

Back to the top