Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Le Fevre2017-01-19 06:58:07 -0500
committerGerrit Code Review @ Eclipse.org2017-01-23 08:52:28 -0500
commitf3ba3f20cdbca8834f87a061ef988eef97e577b6 (patch)
treeacac4ff1f12d66baedae09dd40d9a7ac777628fc /releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
parentdafd624b541b15684f1cd82466dcbb8cc5ca68ba (diff)
downloadorg.eclipse.papyrus-f3ba3f20cdbca8834f87a061ef988eef97e577b6.tar.gz
org.eclipse.papyrus-f3ba3f20cdbca8834f87a061ef988eef97e577b6.tar.xz
org.eclipse.papyrus-f3ba3f20cdbca8834f87a061ef988eef97e577b6.zip
Bug 510670 - [Toolsmiths] Oomph configuration seems not to be uptodate
with latest change with toolsmiths -adapting oomph configuration to ongoing on change on papyrus toolsmiths -an iteration will be necessary due to pending patches Change-Id: I0145b9c6fc9b21fc4681ca157445eea185dbfa94 Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
Diffstat (limited to 'releng/org.eclipse.papyrus.oomph/setups/papyrus.setup')
-rw-r--r--releng/org.eclipse.papyrus.oomph/setups/papyrus.setup18
1 files changed, 6 insertions, 12 deletions
diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
index 89d0f768e5a..76de9d8ba0a 100644
--- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
+++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup
@@ -1184,35 +1184,29 @@
<setupTask xsi:type="setup:VariableTask" name="papyrus.bugzilla.version" value="${papyrus.bugzver.luna}"/>
</stream>
</project>
- <project label="Customization" name="customization">
+ <project label="Toolsmiths" name="toolsmiths">
<setupTask xsi:type="setup.p2:P2Task">
<requirement name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
</setupTask>
<setupTask xsi:type="projects:ProjectsImportTask">
<sourceLocator rootFolder="${papyrus.git.clone.location/plugins/customization}"/>
<sourceLocator rootFolder="${papyrus.git.clone.location/tests/junit/plugins/customization}"/>
- <sourceLocator rootFolder="${papyrus.git.clone.location/features}">
- <predicate xsi:type="predicates:AndPredicate">
- <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.(tests\.)?customization($|\..+)"/>
- </predicate>
- </sourceLocator>
+ <sourceLocator rootFolder="${papyrus.git.clone.location/features/papyrus-toolsmiths-features}" />
</setupTask>
<setupTask xsi:type="setup.workingsets:WorkingSetTask">
- <workingSet id="papyrus-customization" name="Papyrus Customization">
+ <workingSet id="papyrus-toolsmiths" name="Papyrus Toolsmiths">
<predicate xsi:type="predicates:AndPredicate">
- <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.customization"/>
<operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.PluginNature"/>
<operand xsi:type="predicates:OrPredicate">
<operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
- <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.editor(?:$|\..+)"/>
</operand>
</predicate>
</workingSet>
- <workingSet id="papyrus-customization-features" name="Papyrus Customization Features">
+ <workingSet id="papyrus-toolsmiths-features" name="Papyrus Toolsmiths Features">
<predicate xsi:type="predicates:AndPredicate">
- <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.customization.feature"/>
+ <operand xsi:type="predicates:RepositoryPredicate" project="org.eclipse.papyrus.toolsmiths.feature"/>
<operand xsi:type="predicates:NaturePredicate" nature="org.eclipse.pde.FeatureNature"/>
- <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.customization(?:$|\..+)"/>
+ <operand xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.papyrus\.toolsmiths(?:$|\..+)"/>
</predicate>
</workingSet>
</setupTask>

Back to the top