Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Oomph-Setup] Change Equinox configuration setup to contain only equinox #689

Merged
merged 1 commit into from
Oct 13, 2024
Merged

[Oomph-Setup] Change Equinox configuration setup to contain only equinox #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ Equinox implements the follwoing specification with the given level of complianc
- Asking questions and share ideas: https://github.com/eclipse-equinox/equinox/discussions

# Contributing
[![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")

For detailed information about development, testing and builds, see [CONTRIBUTING.md](CONTRIBUTING.md).

[![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")
15 changes: 10 additions & 5 deletions releng/org.eclipse.equinox.releng/Equinox.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
<value>https://projects.eclipse.org/projects/eclipse.equinox</value>
</detail>
</annotation>
<annotation
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
<reference
href="EquinoxConfiguration.setup#/"/>
</annotation>
<setupTask
xsi:type="setup:CompoundTask"
name="User Preferences">
Expand Down Expand Up @@ -132,6 +127,11 @@
</setupTask>
<project name="core"
label="Core">
<annotation
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
<reference
href="EquinoxConfiguration.setup#/"/>
</annotation>
<setupTask
xsi:type="git:GitCloneTask"
id="github.clone.equinox.core"
Expand Down Expand Up @@ -212,6 +212,11 @@
</project>
<project name="p2"
label="P2">
<annotation
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
<reference
href="https://raw.githubusercontent.com/eclipse-equinox/p2/master/releng/org.eclipse.equinox.p2.setup/EquinoxP2Configuration.setup#/"/>
</annotation>
<setupTask
xsi:type="git:GitCloneTask"
id="github.clone.equinox.p2"
Expand Down
23 changes: 9 additions & 14 deletions releng/org.eclipse.equinox.releng/EquinoxConfiguration.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
value="equinox"/>
<productVersion
href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.applications']/@products[name='eclipse.platform.sdk']/@versions[name='latest']"/>
<description>The Equinox installation provides the latest tools needed to work with the Eclipse Equinox's source code.</description>
<description>The Equinox installation provides the latest tools needed to work with the project's source code.</description>
</installation>
<workspace
name="equinox.workspace"
Expand Down Expand Up @@ -61,29 +61,24 @@
value="Equinox"/>
</setupTask>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
name="eclipse.git.authentication.style"
defaultValue="anonymous"/>
Comment on lines -64 to -67
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@merks is it necessary to define this variable? As far as I can tell, the default is already anonymous anyways:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think not. I think I changed this from the olden days when one typically wanted a gerrit URI for contribution, but now one can use anonymous and commit to a fork, and even the committers do that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, personally I usually fetch from the upstream/original repo using https and push to my fork via SSH.

Ok, good. Then we can probably remove it from all other configurations. I can take care of that.
Thanks.

<stream
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='binaries']/@streams[name='master']"/>
<stream
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='core']/@streams[name='master']"/>
<stream
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='equinox']/@projects[name='p2']/@streams[name='master']"/>
<description>The Equinox workspace provides the source code of the Equinox project.</description>
<description>The Equinox workspace provides all the source code of the project.</description>
</workspace>
<description>
&lt;p>
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 source projects of the &lt;a href=&quot;https://projects.eclipse.org/projects/eclipse.equinox&quot;>Equinox project&lt;/a>.
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,
i.e. the projects that are contained in the &lt;a href=&quot;https://github.com/eclipse-equinox/equinox&quot;>equinox&lt;/a> repository.
&lt;/p>
&lt;p>
All the source projects from &lt;a href=&quot;https://github.com/eclipse-equinox&quot;>Equinox's Github Repositories&lt;/a>
are available, organized into working sets, and ready for contribution.
&lt;/p>
The installation is based on the latest successful integration build of the &lt;code>Eclipse Platform SDK&lt;/code>,
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.
&lt;p>
&lt;/p>
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.
Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the tutorial instructions&lt;/a> for more details.
&lt;/p>
</description>
</setup:Configuration>
Loading