updated setup file with EASE plugins + added oxygen stream
diff --git a/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-latest.setup b/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-latest.setup
index 2822cc2..0a9df0e 100644
--- a/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-latest.setup
+++ b/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-latest.setup
@@ -124,6 +124,22 @@
url="http://download.eclipse.org/oomph/drops/release/1.9.0"/>
</setupTask>
<setupTask
+ xsi:type="setup.p2:P2Task"
+ label="EASE">
+ <requirement
+ name="org.eclipse.ease.feature.feature.group"/>
+ <requirement
+ name="org.eclipse.ease.lang.javascript.feature.feature.group"/>
+ <requirement
+ name="org.eclipse.ease.lang.jvm.feature.feature.group"/>
+ <requirement
+ name="org.eclipse.ease.modules.feature.feature.group"/>
+ <requirement
+ name="org.eclipse.ease.ui.feature.feature.group"/>
+ <repository
+ url="http://download.eclipse.org/ease/update/release"/>
+ </setupTask>
+ <setupTask
xsi:type="setup:VariableTask"
id="app4mc.target.platform"
name="app4mc.target.platform"
@@ -149,8 +165,8 @@
name="${app4mc.target.platform}">
<description>Target Platform used for the new install.</description>
</setupTask>
- <stream name="develop_test_neon"
- label="develop_test_neon">
+ <stream name="develop_oxygen"
+ label="develop_oxygen">
<setupTask
xsi:type="setup:EclipseIniTask"
disabled="true"
@@ -168,10 +184,26 @@
name="scope.project.stream.name"
value="develop"/>
<setupTask
- xsi:type="setup:VariableTask"
- id="git.clone.app4mc.location"
- name="git.clone.app4mc.location"
- value="D:\dev_ide\app4mc-0.8.3-source-code\org.eclipse.app4mc"/>
+ xsi:type="git:GitCloneTask"
+ id="git.clone.app4mc"
+ remoteURI="app4mc/org.eclipse.app4mc">
+ <annotation
+ source="http://www.eclipse.org/oomph/setup/InducedChoices">
+ <detail
+ key="inherit">
+ <value>eclipse.git.gerrit.remoteURIs</value>
+ </detail>
+ <detail
+ key="label">
+ <value>APP4MC Git repository</value>
+ </detail>
+ <detail
+ key="target">
+ <value>remoteURI</value>
+ </detail>
+ </annotation>
+ <description>${scope.project.label}</description>
+ </setupTask>
<setupTask
xsi:type="projects:ProjectsImportTask">
<sourceLocator
@@ -1361,6 +1393,286 @@
</workingSet>
</setupTask>
</stream>
+ <stream name="local_content_app4mc"
+ label="local_content_app4mc">
+ <setupTask
+ xsi:type="setup:EclipseIniTask"
+ disabled="true"
+ option="-Doomph.redirection.app4mc"
+ value="=https://git.eclipse.org/c/app4mc/org.eclipse.app4mc.git/plain/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-new.setup->${git.clone.app4mc.location|uri}/build/org.eclipse.app4mc.ide.setup/APP4MC-Development-IDE-latest.setup"
+ vm="true">
+ <description>
+ Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.
+ Before enabling this task, replace '...' with the repository path of this setup's containing project.
+ </description>
+ </setupTask>
+ <setupTask
+ xsi:type="projects:ProjectsImportTask">
+ <sourceLocator
+ rootFolder="${git.clone.app4mc.location}">
+ <excludedPath>/content_compatible_to_previous_targets/mars</excludedPath>
+ </sourceLocator>
+ </setupTask>
+ <setupTask
+ xsi:type="setup.workingsets:WorkingSetTask">
+ <workingSet
+ name="Docu">
+ <predicate
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.help"/>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="website"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Model">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.model\.help"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.model"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.sphinx"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.emf\.util.*"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Model Edit">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.edit\.help"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.model\.edit"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.sphinx\.ui.*"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Model Editors">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.editors.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.atdb.*"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Model Migration">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.converters.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.jdom2"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.jaxen"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Model Validation">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.validation.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.validation.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.powermock"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Import">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.import.*"/>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Export">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\.export.*"/>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Workflow"
+ id="">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern=".*workflow.*"/>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Multicore">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.multicore.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.ojalgo.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.jgrapht.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.jenetics"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Tracing">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.tracing.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.sqlite.*"/>
+ </operand>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.PluginNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Examples">
+ <predicate
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.amalthea\..*example.*"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Features">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc.*"/>
+ <operand
+ xsi:type="predicates:NaturePredicate"
+ nature="org.eclipse.pde.FeatureNature"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Platform">
+ <predicate
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.platform\.product.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.platform\.ide.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.platform\.examplesbuilder.*"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Build">
+ <predicate
+ xsi:type="predicates:OrPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.ide\.setup"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.build.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\..*p2repo.*"/>
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern="org\.eclipse\.app4mc\.target.*"/>
+ </predicate>
+ </workingSet>
+ </setupTask>
+ </stream>
<logicalProjectContainer
xsi:type="setup:ProjectCatalog"
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
