Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2019-02-24 16:19:56 -0500
committerMarc-Andre Laperle2019-02-24 16:19:56 -0500
commitc626ede91792ecdc390aeac3c999f261173cb1ca (patch)
treea868434fa12c0ef13e76a9fbc8e022840a8c3d9a
parent182de94259b9f3e6a23609d184145b51910f7597 (diff)
downloadorg.eclipse.cdt-c626ede91792ecdc390aeac3c999f261173cb1ca.tar.gz
org.eclipse.cdt-c626ede91792ecdc390aeac3c999f261173cb1ca.tar.xz
org.eclipse.cdt-c626ede91792ecdc390aeac3c999f261173cb1ca.zip
Bug 543958: CDT Standalone debugger crashes on startup
org.apache.felix.scr now needs a start-level. See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=538729 Change-Id: Ia6f83a93449aeb32566be8893237e4bd2842b462 Signed-off-by: Marc-Andre Laperle <malaperle@gmail.com>
-rw-r--r--debug/org.eclipse.cdt.debug.application.product/debug.product1
-rw-r--r--debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index e6e57d2b75..7936d16705 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -383,6 +383,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</plugins>
<configurations>
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
diff --git a/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java b/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java
index b0d04b60c0..c9766f4882 100644
--- a/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java
+++ b/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java
@@ -39,6 +39,7 @@ public class ConfigGenerator {
private static final Set<String> PLUGINS_NOT_IN_SCRIPT_VERSION = new HashSet<>();
static {
+ PLUGINS_WITH_START_LEVEL.put("org.apache.felix.scr", "@1\\:start"); //$NON-NLS-1$ //$NON-NLS-2$
PLUGINS_WITH_START_LEVEL.put("org.eclipse.equinox.ds", "@1\\:start"); //$NON-NLS-1$ //$NON-NLS-2$
PLUGINS_WITH_START_LEVEL.put("org.eclipse.equinox.common", "@2\\:start"); //$NON-NLS-1$ //$NON-NLS-2$
PLUGINS_WITH_START_LEVEL.put("org.eclipse.core.runtime", "@start"); //$NON-NLS-1$ //$NON-NLS-2$

Back to the top