[Releng] Provide improved support for setting up a SimRel environment
diff --git a/setups/interim/PlatformSDKConfiguration.setup b/setups/interim/PlatformSDKConfiguration.setup
index 8e7a00f..4918244 100644
--- a/setups/interim/PlatformSDKConfiguration.setup
+++ b/setups/interim/PlatformSDKConfiguration.setup
@@ -133,9 +133,9 @@
i.e., the source projects used to produce the <a href="https://download.eclipse.org/eclipse/downloads/">downloads</a> of the Eclipse Platform Project.
</p>
<p>
- The installation is based on the latest succesfull integration build of the Eclipse Platform SDK,
- the workspace consistents of projects from over two dozen Git clones organized into workings sets,
- the PDE target platform, like the installation, is also based on the latest integation build,
+ The installation is based on the latest successful integration build of the Eclipse Platform SDK,
+ the workspace consists of projects from over two dozen Git clones organized into workings sets,
+ the PDE target platform, like the installation, is also based on the latest integration build,
and the API baseline is based on the most recent release.
<p>
</p>
diff --git a/setups/interim/SimultaneousReleaseTrain.setup b/setups/interim/SimultaneousReleaseTrain.setup
index 0ca5936..a84d1be 100644
--- a/setups/interim/SimultaneousReleaseTrain.setup
+++ b/setups/interim/SimultaneousReleaseTrain.setup
@@ -13,6 +13,33 @@
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/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/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
name="simrel"
label="Simultaneous Release Train">
+ <annotation
+ source="ConfigurationReference">
+ <reference
+ href="SimultaneousReleaseTrainConfiguration.setup#/"/>
+ </annotation>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="User Preferences">
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.core.resources">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.core.resources/refresh.enabled"
+ value="true"/>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.egit.ui">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.egit.ui/commit_dialog_signed_off_by"
+ value="true">
+ <description>Insert Signed-off-by Footer</description>
+ </setupTask>
+ </setupTask>
+ </setupTask>
<setupTask
xsi:type="setup.p2:P2Task"
label="${scope.project.label}">
@@ -41,7 +68,7 @@
<requirement
name="org.eclipse.egit.mylyn.feature.group"/>
<repository
- url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.6/"/>
+ url="http://download.eclipse.org/cbi/updates/aggregator/ide/4.13"/>
<repository
url="http://download.eclipse.org/egit/updates-stable-nightly"/>
<repository
@@ -134,19 +161,7 @@
<setupTask
xsi:type="setup:VariableTask"
name="simrel.train.name"
- value="oxygen"/>
- </stream>
- <stream name="Neon_maintenance">
- <setupTask
- xsi:type="setup:VariableTask"
- name="simrel.train.name"
- value="neon"/>
- </stream>
- <stream name="Mars_maintenance">
- <setupTask
- xsi:type="setup:VariableTask"
- name="simrel.train.name"
- value="mars"/>
+ value="${eclipse.target.platform.latest}"/>
</stream>
<logicalProjectContainer
xsi:type="setup:ProjectCatalog"
diff --git a/setups/interim/SimultaneousReleaseTrainConfiguration.setup b/setups/interim/SimultaneousReleaseTrainConfiguration.setup
new file mode 100644
index 0000000..d30e1d7
--- /dev/null
+++ b/setups/interim/SimultaneousReleaseTrainConfiguration.setup
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<setup:Configuration
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
+ label="Simultaneous Release Train">
+ <annotation
+ source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+ <detail
+ key="imageURI">
+ <value>https://git.eclipse.org/c/cbi/org.eclipse.cbi.p2repo.aggregator.git/plain/org.eclipse.cbi.p2repo.aggregator.editor/icons/full/wizban/NewAggregator.png</value>
+ </detail>
+ <detail
+ key="siteURI">
+ <value>https://wiki.eclipse.org/Simrel/Contributing_to_Simrel_Aggregation_Build</value>
+ </detail>
+ </annotation>
+ <installation
+ name="simultaneous.release.train.installation"
+ label="Simultaneous Release Train Installation">
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="installation.id.default"
+ value="simrel"/>
+ <productVersion
+ href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.products']/@products[name='epp.package.committers']/@versions[name='latest']"/>
+ <description>The Simultaneous Release Train installation installs the necessary tools for working with the contributions to the train.</description>
+ </installation>
+ <workspace
+ name="simultaneous.release.train.workspace"
+ label="Simultaneous Release Train Workspace">
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="User Preferences">
+ <setupTask
+ xsi:type="setup:CompoundTask"
+ name="org.eclipse.ui.ide">
+ <setupTask
+ xsi:type="setup:PreferenceTask"
+ key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME"
+ value="SimRel"/>
+ </setupTask>
+ </setupTask>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="git.clone.remoteURI"
+ defaultValue="ssh://${git.user.id|username}@git.eclipse.org:29418/simrel/org.eclipse.simrel.build"
+ label="SimRel Git Repository">
+ <choice
+ value="ssh://${git.user.id|username}@git.eclipse.org:29418/simrel/org.eclipse.simrel.build"
+ label="SSH (read/write, Gerrit)"/>
+ <choice
+ value="https://${git.user.id|username}@git.eclipse.org/r/simrel/org.eclipse.simrel.build"
+ label="HTTPS (read/write, Gerrit)"/>
+ <choice
+ value="https://git.eclipse.org/r/simrel/org.eclipse.simrel.build"
+ label="HTTPS (read-only, anonymous, Gerrit)"/>
+ <description>Choose from the available Gerrit remote URIs</description>
+ </setupTask>
+ <stream
+ href="index:/interim/SimultaneousReleaseTrain.setup#//@streams[name='master']"/>
+ <description>The Simultaneous Release Train workspace provides access to the clone in which contributions are maintained.</description>
+ </workspace>
+ <description>
+ <p>
+ The Simultaneous Release Train configuration provides a specialized development environment for contributing to the <a href="https://wiki.eclipse.org/Simrel/Contributing_to_Simrel_Aggregation_Build">Simultaneous Release</a>
+ </p>
+ <p>
+ The installation is based the latest committers package and includes the tools for working with the aggregation resources.
+ The workspace includes the org.eclispe.simrel.build project from the SimRel Git clone.
+ </p>
+ </description>
+</setup:Configuration>
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index 290d45f..85e5e22 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -56,16 +56,16 @@
xsi:type="setup:VariableTask"
name="bugzilla.id"
defaultValue="anonymous"
- label="Eclipse user ID for Bugzilla/Hudson"
- documentation="The Eclipse user ID for Bugzilla/Hudson. Leave empty if you don't have an account or don't plan to submit bugs.">
- <description>The email associated with the Eclipse Bugzilla/Hudson account</description>
+ label="Eclipse user ID for Bugzilla/Jenkins/Jiro"
+ documentation="The Eclipse user ID for Bugzilla/Jenkins/Jiro. Leave empty if you don't have an account or don't plan to submit bugs.">
+ <description>The email associated with the Eclipse Bugzilla/Jenkins/Jiro account</description>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="PASSWORD"
name="eclipse.user.password"
- label="Eclipse password for Bugzilla/Hudson"
- documentation="The Eclipse password for Bugzilla/Hudson. Leave empty if you don't have an account or don't plan to submit bugs.">
+ label="Eclipse password for Bugzilla/Jenkins/Jiro"
+ documentation="The Eclipse password for Bugzilla/Jenkins/Jiro. Leave empty if you don't have an account or don't plan to submit bugs.">
<annotation
source="http://www.eclipse.org/oomph/setup/PasswordVerification">
<detail
