Skip to content

Commit

Permalink
releng: Make Trace Compass RCP use Java 17 by default
Browse files Browse the repository at this point in the history
- Update default tracing.product for Java 17
- Save current tracing.product file in directory legacy-e4.23-e4.25 for
legacy builds later/equal than e4.23 but before e4.26
- Remove staging/tracing.product
- Remove Solaris entry in product files

Change-Id: Ib57698df51e27688201d14a5e0cec1457548549d
Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/197339
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
  • Loading branch information
bhufmann committed Nov 28, 2022
1 parent 96f8e60 commit bdd6ee1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
Expand Up @@ -26,11 +26,11 @@ SPDX-License-Identifier: EPL-2.0
</programArgs>
<programArgsLin>--launcher.GTK_version 3
</programArgsLin>
<vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
<vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
</vmArgsLin>
<vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
<vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
<vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
<vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
</vmArgsWin>
</launcherArgs>

Expand All @@ -48,10 +48,9 @@ SPDX-License-Identifier: EPL-2.0
</launcher>

<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
<solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>

<license>
Expand Down
Expand Up @@ -50,7 +50,6 @@ SPDX-License-Identifier: EPL-2.0
<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
<solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>

Expand Down
13 changes: 6 additions & 7 deletions rcp/org.eclipse.tracecompass.rcp.product/tracing.product
Expand Up @@ -26,11 +26,11 @@ SPDX-License-Identifier: EPL-2.0
</programArgs>
<programArgsLin>--launcher.GTK_version 3
</programArgsLin>
<vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
<vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
</vmArgsLin>
<vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
<vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
<vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=11
<vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=17
</vmArgsWin>
</launcherArgs>

Expand All @@ -48,10 +48,9 @@ SPDX-License-Identifier: EPL-2.0
</launcher>

<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
<solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
<macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
</vm>

<license>
Expand Down

0 comments on commit bdd6ee1

Please sign in to comment.