Skip to content

Commit 9ee49aa

Browse files
committed
[Oomph-Setup] Change Equinox configuration setup to contain only equinox
Remove the p2 project from the EquinoxConfiguration.setup and unify/clean-up it's content. And add a reference to the new equinox.p2 configuration added to the eclipse-equinox/p2 repository. Part of eclipse-platform/eclipse.platform.releng.aggregator#2430
1 parent 19b406b commit 9ee49aa

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ Equinox implements the follwoing specification with the given level of complianc
3737
- Asking questions and share ideas: https://github.com/eclipse-equinox/equinox/discussions
3838

3939
# Contributing
40-
[![Create Eclipse Development Environment for Equinox](https://download.eclipse.org/oomph/www/setups/svg/Equinox.svg)](https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-equinox/equinox/master/releng/org.eclipse.equinox.releng/EquinoxConfiguration.setup&show=true "Click to open Eclipse-Installer Auto Launch or drag into your running installer")
4140

4241
For detailed information about development, testing and builds, see [CONTRIBUTING.md](CONTRIBUTING.md).
42+
43+
[![Create Eclipse Development Environment for Equinox](https://download.eclipse.org/oomph/www/setups/svg/Equinox.svg)](
44+
https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-equinox/equinox/master/releng/org.eclipse.equinox.releng/EquinoxConfiguration.setup&show=true
45+
"Click to open Eclipse-Installer Auto Launch or drag into your running installer")

releng/org.eclipse.equinox.releng/Equinox.setup

+10-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
<value>https://projects.eclipse.org/projects/eclipse.equinox</value>
2525
</detail>
2626
</annotation>
27-
<annotation
28-
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
29-
<reference
30-
href="EquinoxConfiguration.setup#/"/>
31-
</annotation>
3227
<setupTask
3328
xsi:type="setup:CompoundTask"
3429
name="User Preferences">
@@ -132,6 +127,11 @@
132127
</setupTask>
133128
<project name="core"
134129
label="Core">
130+
<annotation
131+
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
132+
<reference
133+
href="EquinoxConfiguration.setup#/"/>
134+
</annotation>
135135
<setupTask
136136
xsi:type="git:GitCloneTask"
137137
id="github.clone.equinox.core"
@@ -212,6 +212,11 @@
212212
</project>
213213
<project name="p2"
214214
label="P2">
215+
<annotation
216+
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
217+
<reference
218+
href="https://raw.githubusercontent.com/eclipse-equinox/p2/master/releng/org.eclipse.equinox.p2.setup/EquinoxP2Configuration.setup#/"/>
219+
</annotation>
215220
<setupTask
216221
xsi:type="git:GitCloneTask"
217222
id="github.clone.equinox.p2"

releng/org.eclipse.equinox.releng/EquinoxConfiguration.setup

+9-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
value="equinox"/>
2626
<productVersion
2727
href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.applications']/@products[name='eclipse.platform.sdk']/@versions[name='latest']"/>
28-
<description>The Equinox installation provides the latest tools needed to work with the Eclipse Equinox's source code.</description>
28+
<description>The Equinox installation provides the latest tools needed to work with the project's source code.</description>
2929
</installation>
3030
<workspace
3131
name="equinox.workspace"
@@ -61,29 +61,24 @@
6161
value="Equinox"/>
6262
</setupTask>
6363
</setupTask>
64-
<setupTask
65-
xsi:type="setup:VariableTask"
66-
name="eclipse.git.authentication.style"
67-
defaultValue="anonymous"/>
6864
<stream
6965
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='binaries']/@streams[name='master']"/>
7066
<stream
7167
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='core']/@streams[name='master']"/>
72-
<stream
73-
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='p2']/@streams[name='master']"/>
74-
<description>The Equinox workspace provides the source code of the Equinox project.</description>
68+
<description>The Equinox workspace provides all the source code of the project.</description>
7569
</workspace>
7670
<description>
7771
&lt;p>
78-
The &lt;a href=&quot;https://www.eclipse.org/equinox/&quot;/>Equinox&lt;/a> configuration provisions a dedicated development environment
79-
for the complete set of source projects of the &lt;a href=&quot;https://projects.eclipse.org/projects/eclipse.equinox&quot;>Equinox project&lt;/a>.
72+
The &lt;a href=&quot;https://www.eclipse.org/equinox/&quot;/>Equinox&lt;/a> configuration provisions a dedicated development environment for the complete set of projects that comprise the Equinox framework,
73+
i.e. the projects that are contained in the &lt;a href=&quot;https://github.com/eclipse-equinox/equinox&quot;>equinox&lt;/a> repository.
8074
&lt;/p>
8175
&lt;p>
82-
All the source projects from &lt;a href=&quot;https://github.com/eclipse-equinox&quot;>Equinox's Github Repositories&lt;/a>
83-
are available, organized into working sets, and ready for contribution.
84-
&lt;/p>
76+
The installation is based on the latest successful integration build of the &lt;code>Eclipse Platform SDK&lt;/code>,
77+
the PDE target platform, like the installation, is also based on the latest integration build,
78+
and the API baseline is based on the most recent release.
79+
&lt;p>
8580
&lt;/p>
86-
Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the analogous tutorial instructions&lt;/a> for the Eclipse Platform SDK's configuration for more details.
81+
Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the tutorial instructions&lt;/a> for more details.
8782
&lt;/p>
8883
</description>
8984
</setup:Configuration>

0 commit comments

Comments
 (0)