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.

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 #75

Merged
merged 1 commit into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
<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" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<license>
Expand Down Expand Up @@ -279,4 +281,9 @@ United States, other countries, or both.
<plugin id="slf4j.simple"/>
</plugins>

<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>
44 changes: 0 additions & 44 deletions packages/org.eclipse.epp.package.committers.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
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.epp.committers.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.epp.committers.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.epp.committers.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.epp.committers.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.epp.committers.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.epp.committers.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:);

# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
#
Expand All @@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

# 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 = 2023-12 Release of the Eclipse Committers package.

Expand Down
7 changes: 7 additions & 0 deletions packages/org.eclipse.epp.package.cpp.product/epp.product
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
<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" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<license>
Expand Down Expand Up @@ -283,4 +285,9 @@ United States, other countries, or both.
<plugin id="slf4j.simple"/>
</plugins>

<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>
44 changes: 0 additions & 44 deletions packages/org.eclipse.epp.package.cpp.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
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.epp.cpp.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.epp.cpp.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.epp.cpp.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.epp.cpp.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.epp.cpp.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.epp.cpp.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:);

# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
#
Expand All @@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

# 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 = 2023-12 Release of the Eclipse C/C++ Developers Developers package.

Expand Down
6 changes: 6 additions & 0 deletions packages/org.eclipse.epp.package.dsl.product/epp.product
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
<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" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<license>
Expand Down Expand Up @@ -253,5 +255,9 @@ United States, other countries, or both.
<feature id="org.eclipse.buildship" installMode="root"/>
</features>

<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>
44 changes: 0 additions & 44 deletions packages/org.eclipse.epp.package.dsl.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
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.epp.dsl.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.epp.dsl.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.epp.dsl.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.epp.dsl.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.epp.dsl.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.epp.dsl.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:);

# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
#
Expand All @@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

# 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 = 2023-12 Release of the Eclipse DSL Tools package.

Expand Down
7 changes: 7 additions & 0 deletions packages/org.eclipse.epp.package.embedcpp.product/epp.product
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
<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" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<license>
Expand Down Expand Up @@ -299,4 +301,9 @@ United States, other countries, or both.
<plugin id="slf4j.simple"/>
</plugins>

<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>
44 changes: 0 additions & 44 deletions packages/org.eclipse.epp.package.embedcpp.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
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.epp.embedcpp.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.epp.embedcpp.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.epp.embedcpp.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.epp.embedcpp.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.epp.embedcpp.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.epp.embedcpp.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:);

# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
#
Expand All @@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

# 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 = 2023-12 Release of the Eclipse Embedded C/C++ Developers Developers package.

Expand Down
6 changes: 6 additions & 0 deletions packages/org.eclipse.epp.package.java.product/epp.product
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
<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" />
<property name="osgi.instance.area.default" value="@user.home/Documents/workspace" os="macosx" />
</configurations>

<license>
Expand Down Expand Up @@ -261,5 +263,9 @@ United States, other countries, or both.
<feature id="org.eclipse.mylyn.jdt.feature" installMode="root"/>
</features>

<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>
44 changes: 0 additions & 44 deletions packages/org.eclipse.epp.package.java.product/p2.inf
Original file line number Diff line number Diff line change
@@ -1,46 +1,6 @@
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.epp.java.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.epp.java.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.epp.java.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.epp.java.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.epp.java.configuration
units.2.version=1.0.0
units.2.provides.1.namespace=org.eclipse.equinox.p2.iu
units.2.provides.1.name=toolingorg.eclipse.epp.java.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:);

# Bug 490515 - Prevent upgrade from old to new EPP package layout
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
#
Expand All @@ -56,10 +16,6 @@ update.range = [4.6.0.20160301-1200, $version$)
update.severity = 0
update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

# 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 = 2023-12 Release of the Eclipse Java Developers package.

Expand Down
Loading