Skip to content

Commit c3f4920

Browse files
author
Guru Hb
committed
6974: Try to use the chromium SWT browser by default on windows
Reviewed-by: hirt
1 parent cfd3860 commit c3f4920

File tree

6 files changed

+29
-2
lines changed

6 files changed

+29
-2
lines changed

application/org.openjdk.jmc.feature.core/feature.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,17 @@
6262
<import plugin="org.eclipse.e4.core.contexts"/>
6363
</requires>
6464

65+
<plugin
66+
id="com.make.chromium.cef.win32.win32.x86_64"
67+
os="win32"
68+
ws="win32"
69+
arch="x86_64"
70+
download-size="0"
71+
install-size="0"
72+
version="0.0.0"
73+
fragment="true"
74+
unpack="false"/>
75+
6576
<plugin
6677
id="org.openjdk.jmc.attach"
6778
download-size="0"
@@ -181,4 +192,4 @@
181192
version="0.0.0"
182193
unpack="false"/>
183194

184-
</feature>
195+
</feature>

application/org.openjdk.jmc.rcp.product/jmc.product

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</programArgsMac>
5757
<programArgsWin>
5858
</programArgsWin>
59-
<vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
59+
<vmArgs>-XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=128 -XX:+FlightRecorder -XX:StartFlightRecording=name=JMC_Default,maxsize=100m -Djava.net.preferIPv4Stack=true -Djdk.attach.allowAttachSelf=true -Dorg.eclipse.swt.browser.DefaultType=chromium --add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-exports=java.management/sun.management=ALL-UNNAMED --add-exports=java.management/sun.management.counter.perf=ALL-UNNAMED --add-exports=jdk.management.agent/jdk.internal.agent=ALL-UNNAMED --add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED
6060
-Dsun.java.command=JMC
6161
</vmArgs>
6262
<vmArgsLin>--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED

releng/platform-definitions/platform-definition-2019-12/platform-definition-2019-12.target

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.14.0.v20200113020001"/>
6060
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.17.1/2019-12/"/>
6161
</location>
62+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
63+
<unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.202005172227"/>
64+
<repository location="https://equo-chromium-cef.ams3.digitaloceanspaces.com/rls/repository"/>
65+
</location>
6266
</locations>
6367
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6468
</target>

releng/platform-definitions/platform-definition-2020-03/platform-definition-2020-03.target

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.14.0.v20200113020001"/>
6060
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.17.1/2019-12/"/>
6161
</location>
62+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
63+
<unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.202005172227"/>
64+
<repository location="https://equo-chromium-cef.ams3.digitaloceanspaces.com/rls/repository"/>
65+
</location>
6266
</locations>
6367
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6468
</target>

releng/platform-definitions/platform-definition-2020-06/platform-definition-2020-06.target

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.16.0.v20200711020001"/>
6060
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.0/2020-06/"/>
6161
</location>
62+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
63+
<unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.202005172227"/>
64+
<repository location="https://equo-chromium-cef.ams3.digitaloceanspaces.com/rls/repository"/>
65+
</location>
6266
</locations>
6367
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
6468
</target>

releng/platform-definitions/platform-definition-2020-09/platform-definition-2020-09.target

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@
5959
<unit id="org.eclipse.babel.nls_eclipse_zh.feature.group" version="4.16.0.v20200711020001"/>
6060
<repository location="https://archive.eclipse.org/technology/babel/update-site/R0.18.0/2020-06/"/>
6161
</location>
62+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
63+
<unit id="com.make.chromium.cef.feature.feature.group" version="0.4.0.202005172227"/>
64+
<repository location="https://equo-chromium-cef.ams3.digitaloceanspaces.com/rls/repository"/>
65+
</location>
6266
</locations>
6367
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
6468
</target>

0 commit comments

Comments
 (0)