cleanup target platforms and setup model
diff --git a/org.eclipse.emf.ecoretools.build/EcoreTools.setup b/org.eclipse.emf.ecoretools.build/EcoreTools.setup index 4f66b44..f836a98 100644 --- a/org.eclipse.emf.ecoretools.build/EcoreTools.setup +++ b/org.eclipse.emf.ecoretools.build/EcoreTools.setup
@@ -9,10 +9,9 @@ xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" - xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0" - xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore" name="ecoretools" label="EcoreTools"> <setupTask @@ -58,6 +57,23 @@ value="Luna" defaultValue="None"/> <setupTask + xsi:type="setup:VariableTask" + id="ecoretools.target.platform" + name="ecoretools.target.platform" + defaultValue="Luna Target Platform For EcoreTools" + label="Target Platform - EcoreTools"> + <choice + value="Luna Target Platform For EcoreTools" + label="Eclipse Luna - 4.4"/> + <choice + value="Mars Target Platform For EcoreTools" + label="Eclipse Luna - 4.5"/> + <choice + value="No" + label="No target plaform"/> + <description>Target Platform used for new install. </description> + </setupTask> + <setupTask xsi:type="setup.p2:P2Task"> <requirement name="org.eclipse.swtbot.ide.source.feature.group" @@ -108,50 +124,6 @@ <description>${scope.project.label}</description> </setupTask> <setupTask - xsi:type="setup.targlets:TargletTask"> - <targlet - name="EcoreToolsTarget Platform" - activeRepositoryList="${eclipse.target.platform}"> - <requirement - name="*"/> - <requirement - name="org.eclipse.acceleo.query.feature.group"/> - <requirement - name="org.eclipse.emf.eef.runtime-feature.feature.group"/> - <requirement - name="org.eclipse.emf.sdk.feature.group"/> - <requirement - name="org.eclipse.gmf.runtime.diagram.ui"/> - <requirement - name="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/> - <requirement - name="org.eclipse.sdk.feature.group"/> - <requirement - name="org.eclipse.sirius.runtime.aql.feature.group"/> - <requirement - name="org.eclipse.sirius.runtime.feature.group"/> - <requirement - name="org.eclipse.sirius.runtime.ide.eef.feature.group"/> - <requirement - name="org.eclipse.sirius.runtime.ide.ui.feature.group"/> - <sourceLocator - rootFolder="${git.clone.ecoretools.location}"/> - <repositoryList - name="Luna"> - <repository - url="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/> - <repository - url="http://download.eclipse.org/sirius/updates/nightly/3.0.x/luna"/> - <repository - url="http://download.eclipse.org/releases/luna"/> - <repository - url="https://hudson.eclipse.org/acceleo/job/acceleo-master/lastSuccessfulBuild/artifact/releng/org.eclipse.acceleo-updatesite/target/repository"/> - <repository - url="http://download.eclipse.org/cbi/updates/license"/> - </repositoryList> - </targlet> - </setupTask> - <setupTask xsi:type="setup.workingsets:WorkingSetTask"> <workingSet name="EcoreTools">
diff --git a/org.eclipse.emf.ecoretools.build/luna.target b/org.eclipse.emf.ecoretools.build/luna.target index f8bcaed..15d9802 100644 --- a/org.eclipse.emf.ecoretools.build/luna.target +++ b/org.eclipse.emf.ecoretools.build/luna.target
@@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> -<target name="Luna Target Platform For EcoreTools" sequenceNumber="1427203488"> +<target name="Luna Target Platform For EcoreTools" sequenceNumber="1453480883"> <locations> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/> <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/> <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/> <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/> - <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/nightly/3.0.x/luna"/> + <repository id="Sirius" location="http://download.eclipse.org/sirius/updates/nightly/3.1.x/luna"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/> @@ -16,7 +16,7 @@ </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/> - <repository id="Acceleo" location="https://hudson.eclipse.org/acceleo/job/acceleo-master/lastSuccessfulBuild/artifact/releng/org.eclipse.acceleo-updatesite/target/repository/"/> + <repository id="Acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321"/> </location> <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.emf.ecoretools.build/luna.tpd b/org.eclipse.emf.ecoretools.build/luna.tpd index 2747d86..bee60cf 100644 --- a/org.eclipse.emf.ecoretools.build/luna.tpd +++ b/org.eclipse.emf.ecoretools.build/luna.tpd
@@ -1,5 +1,5 @@ target "Luna Target Platform For EcoreTools" with source requirements -location "http://download.eclipse.org/sirius/updates/nightly/3.0.x/luna" Sirius { +location "http://download.eclipse.org/sirius/updates/nightly/3.1.x/luna" Sirius { org.eclipse.sirius.runtime.aql.feature.group lazy org.eclipse.sirius.runtime.feature.group lazy org.eclipse.sirius.runtime.ide.ui.feature.group lazy @@ -9,7 +9,7 @@ org.eclipse.emf.eef.runtime-feature.feature.group lazy } -location "https://hudson.eclipse.org/acceleo/job/acceleo-master/lastSuccessfulBuild/artifact/releng/org.eclipse.acceleo-updatesite/target/repository/" Acceleo { +location "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321" Acceleo { org.eclipse.acceleo.query.feature.group lazy } location "http://download.eclipse.org/releases/luna/201502271000" {
diff --git a/org.eclipse.emf.ecoretools.build/mars.target b/org.eclipse.emf.ecoretools.build/mars.target new file mode 100644 index 0000000..1eec44a --- /dev/null +++ b/org.eclipse.emf.ecoretools.build/mars.target
@@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> +<target name="Mars Target Platform For EcoreTools" sequenceNumber="1453480959"> + <locations> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/> + <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/> + <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/> + <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/> + <repository location="http://download.eclipse.org/sirius/updates/nightly/3.1.x/mars"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="0.0.0"/> + <repository id="EEF" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/> + <repository id="Acceleo" location="http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321"/> + </location> + <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit"> + <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/> + <unit id="org.eclipse.gmf.runtime.diagram.ui.resources.editor" version="0.0.0"/> + <repository location="http://download.eclipse.org/releases/mars"/> + </location> + </locations> +</target>
diff --git a/org.eclipse.emf.ecoretools.build/mars.tpd b/org.eclipse.emf.ecoretools.build/mars.tpd new file mode 100644 index 0000000..9b7ec7e --- /dev/null +++ b/org.eclipse.emf.ecoretools.build/mars.tpd
@@ -0,0 +1,20 @@ +target "Mars Target Platform For EcoreTools" with source requirements +location "http://download.eclipse.org/sirius/updates/nightly/3.1.x/mars" { + org.eclipse.sirius.runtime.aql.feature.group lazy + org.eclipse.sirius.runtime.feature.group lazy + org.eclipse.sirius.runtime.ide.ui.feature.group lazy + org.eclipse.sirius.runtime.ide.eef.feature.group lazy +} +location "http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052/" EEF { + org.eclipse.emf.eef.runtime-feature.feature.group lazy +} + +location "http://download.eclipse.org/acceleo/updates/milestones/3.6/S201601191321" Acceleo { + org.eclipse.acceleo.query.feature.group lazy +} +location "http://download.eclipse.org/releases/mars" { + org.eclipse.sdk.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.gmf.runtime.diagram.ui lazy + org.eclipse.gmf.runtime.diagram.ui.resources.editor lazy +} \ No newline at end of file