Suggested changes to RMF's setup. This relies on the wildcard requirements in targlets; the build to support that will be available later today. Change-Id: Ic56429e0b333518d714304fc88330ad169ac03e5 Signed-off-by: Ed Merks <ed.merks@gmail.com>
diff --git a/org.eclipse.rmf.releng/oomph/RMF.setup b/org.eclipse.rmf.releng/oomph/RMF.setup index e4a07d8..ff3903c 100644 --- a/org.eclipse.rmf.releng/oomph/RMF.setup +++ b/org.eclipse.rmf.releng/oomph/RMF.setup
@@ -7,12 +7,11 @@ xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0" xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0" xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" - xmlns:projects="http://www.eclipse.org/oomph/setup/projects/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" - 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/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.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" + 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" name="rmf" label="RMF"> <setupTask @@ -29,6 +28,11 @@ <description>Set the heap space needed to work with the projects of ${scope.project.label}</description> </setupTask> <setupTask + xsi:type="setup:EclipseIniTask" + option="-Doomph.redirection.rmf" + value="=http://git.eclipse.org/c/rmf/org.eclipse.rmf.git/plain/org.eclipse.rmf.releng/oomph/RMF.setup->${rmf.git.clone.location|uri}/org.eclipse.rmf.releng/oomph/RMF.setup" + vm="true"/> + <setupTask xsi:type="setup:ResourceCreationTask" excludedTriggers="STARTUP MANUAL" content="<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
		<item value="true" key="group_libraries"/>
		<item value="false" key="linkWithEditor"/>
		<item value="2" key="layout"/>
		<item value="2" key="rootMode"/>
		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
	</section>
</section>
" @@ -104,28 +108,33 @@ xsi:type="setup.targlets:TargletTask"> <targlet name="${scope.project.label}" - activeRepositoryList="${rmf.target.platform}"> + activeRepositoryList="${eclipse.target.platform}"> <requirement name="org.eclipse.sdk.ide"/> <requirement - name="org.eclipse.equinox.executable.feature.group"/> - <requirement name="org.eclipse.emf.sdk.feature.group"/> <requirement name="org.eclipse.emf.validation.sdk.feature.group"/> <requirement name="org.eclipse.xsd.sdk.feature.group"/> <requirement - name="org.eclipse.sphinx.emf.serialization.feature.group"/> - <requirement - name="com.google.guava"/> - <requirement - name="org.apache.poi"/> - <requirement - name="org.apache.xerces"/> + name="*"/> <sourceLocator rootFolder="${rmf.git.clone.location}"/> <repositoryList + name="Neon"> + <repository + url="http://download.eclipse.org/releases/mars"/> + <repository + url="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/> + <repository + url="http://download.eclipse.org/sphinx/updates/releases/0.9.x"/> + <repository + url="http://download.eclipse.org/eclipse/updates/4.5/"/> + <repository + url="http://download.eclipse.org/cbi/updates/license"/> + </repositoryList> + <repositoryList name="Mars"> <repository url="http://download.eclipse.org/releases/mars"/> @@ -182,7 +191,7 @@ <setupTask xsi:type="setup.workingsets:WorkingSetTask"> <workingSet - name="${scope.project.name}"> + name="RMF"> <predicate xsi:type="predicates:OrPredicate"> <operand @@ -283,6 +292,9 @@ <predicate xsi:type="predicates:NamePredicate" pattern="org\.eclipse\.rmf\.docs.*"/> + <predicate + xsi:type="predicates:NamePredicate" + pattern="specifications"/> </workingSet> <workingSet name="RMF Features" @@ -383,17 +395,6 @@ <description>RMF documentation</description> </setupTask> </setupTask> - <setupTask - xsi:type="setup:CompoundTask" - name="Imports"> - <setupTask - xsi:type="projects:ProjectsImportTask" - id=""> - <sourceLocator - rootFolder="${rmf.git.clone.location}" - locateNestedProjects="true"/> - </setupTask> - </setupTask> <stream name="develop" label="Develop"> <setupTask @@ -403,10 +404,6 @@ <repository url="http://download.eclipse.org/releases/mars"/> </setupTask> - <setupTask - xsi:type="setup:VariableTask" - name="rmf.target.platform" - value="Mars"/> </stream> <stream name="master" label="Master"> @@ -417,10 +414,6 @@ <repository url="http://download.eclipse.org/releases/mars"/> </setupTask> - <setupTask - xsi:type="setup:VariableTask" - name="rmf.target.platform" - value="Mars"/> </stream> <logicalProjectContainer xsi:type="setup:ProjectCatalog"