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

Move more product configuration from p2.inf to product-file #1459

Merged
merged 1 commit into from
Oct 28, 2023
Merged

Move more product configuration from p2.inf to product-file #1459

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
42 changes: 0 additions & 42 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,5 @@
instructions.configure=\
addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.platform.configuration.macosx
requires.1.filter=(osgi.os=macosx)
requires.1.range=[1.0.0,1.0.0]
requires.1.greedy=true

requires.2.namespace=org.eclipse.equinox.p2.iu
requires.2.name=toolingorg.eclipse.platform.configuration
requires.2.filter=(!(osgi.os=macosx))
requires.2.range=[1.0.0,1.0.0]
requires.2.greedy=true

units.1.id=toolingorg.eclipse.platform.configuration.macosx
units.1.version=1.0.0
units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
units.1.provides.1.name=toolingorg.eclipse.platform.configuration.macosx
units.1.provides.1.version=1.0.0
units.1.filter=(osgi.os=macosx)
units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
units.1.touchpoint.version=1.0.0
units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
#ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
#org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);

units.2.id=toolingorg.eclipse.platform.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.platform.configuration
units.2.provides.1.version=1.0.0
units.2.filter=(!(osgi.os=macosx))
units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
units.2.touchpoint.version=1.0.0
units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);

# Restrict range so we are not an automatic update for 3.x.
update.id = org.eclipse.platform.ide
Expand All @@ -47,9 +8,6 @@ update.severity = 0
update.description = An update for 4.x generation Eclipse Platform.

# Set the product property type
properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 4.30 Release of the Eclipse Platform.

Expand Down
7 changes: 7 additions & 0 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ United States, other countries, or both.
<property name="org.eclipse.update.reconcile" value="false" />
<property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
<property name="osgi.bundles.defaultStartLevel" value="4" />
<property name="osgi.instance.area.default" value="@user.home/workspace" />
Copy link
Contributor

Choose a reason for hiding this comment

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

IIRC, EPP uses eclipse-workspace here. Should we also change it for SDK products?

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you mean that the default suggestion for the workspace should be co-located to the installation?
Yes that's something I would also support. I always annoys me if I download an SDK to test something out that I first have to define the test workspace to be somewhere else than in such prominent location.

I'll create a follow-up PR on this so that we can discuss that then.

Copy link
Contributor

Choose a reason for hiding this comment

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

No, I don't think he means that. Me means it's specified like this:

[email protected]/eclipse-workspace

I think co-locating it with the installation you have to be careful it's not a read-only installation; maybe you'd co-located it relative to the installation surrogate but might even end up with a read-only location...

<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<repositories>
<repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
<repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
</repositories>

</product>
40 changes: 0 additions & 40 deletions eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,5 @@
instructions.configure=\
addRepository(type:0,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
addRepository(type:1,location:https${#58}//download.eclipse.org/eclipse/updates/4.30,name:The Eclipse Project Updates);\
addRepository(type:0,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
addRepository(type:1,location:https${#58}//download.eclipse.org/releases/2023-12,name:2023-12);\
mkdir(path:${installFolder}/dropins);
requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=toolingorg.eclipse.sdk.configuration.macosx
requires.1.filter=(osgi.os=macosx)
requires.1.range=[1.0.0,1.0.0]
requires.1.greedy=true

requires.2.namespace=org.eclipse.equinox.p2.iu
requires.2.name=toolingorg.eclipse.sdk.configuration
requires.2.filter=(!(osgi.os=macosx))
requires.2.range=[1.0.0,1.0.0]
requires.2.greedy=true

units.1.id=toolingorg.eclipse.sdk.configuration.macosx
units.1.version=1.0.0
units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
units.1.provides.1.name=toolingorg.eclipse.sdk.configuration.macosx
units.1.provides.1.version=1.0.0
units.1.filter=(osgi.os=macosx)
units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
units.1.touchpoint.version=1.0.0
units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);

units.2.id=toolingorg.eclipse.sdk.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.sdk.configuration
units.2.provides.1.version=1.0.0
units.2.filter=(!(osgi.os=macosx))
units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
units.2.touchpoint.version=1.0.0
units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);

# Restrict range so we are not an automatic update for 3.x.
update.id= org.eclipse.sdk.ide
Expand All @@ -45,9 +8,6 @@ update.severity = 0
update.description = An update for 4.x generation Eclipse SDK.

# Set the product property type
properties.0.name = org.eclipse.equinox.p2.type.product
properties.0.value = true

properties.1.name = org.eclipse.equinox.p2.description
properties.1.value = 4.30 Release of the Eclipse SDK.

Expand Down
9 changes: 8 additions & 1 deletion eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</configIni>

<launcherArgs>
<programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
<programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=17 -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=ALL-SYSTEM -Dorg.slf4j.simpleLogger.defaultLogLevel=off -Djava.security.manager=allow
</vmArgs>
Expand Down Expand Up @@ -199,6 +199,13 @@ United States, other countries, or both.
<property name="osgi.bundles.defaultStartLevel" value="4" />
<property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="osgi.instance.area.default" value="@user.home/workspace" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<repositories>
<repository location="https://download.eclipse.org/eclipse/updates/4.30" name="The Eclipse Project Updates" enabled="true" />
<repository location="https://download.eclipse.org/releases/2023-12" name="2023-12" enabled="true" />
</repositories>

</product>