diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.properties b/cross/org.eclipse.cdt.launch.remote/plugin.properties index 4fcb15e2241..a6eea126600 100644 --- a/cross/org.eclipse.cdt.launch.remote/plugin.properties +++ b/cross/org.eclipse.cdt.launch.remote/plugin.properties @@ -13,8 +13,7 @@ pluginName=C/C++ Remote Debug Launcher providerName=Eclipse CDT -launchConfigurationType.name = C/C++ Remote Application -cdiLaunchDelegate.name = Standard C/C++ Remote Application -cdiLaunchDelegate.description = Standard remote application launching/debugging using the standard debugger Framework (CDI). -dsfLaunchDelegate.name = GDB (DSF) Remote Debugging -dsfLaunchDelegate.description = Start new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). \ No newline at end of file +cdiLaunchDelegate.name = Standard Remote Create Process +cdiLaunchDelegate.description = Automatically start and optionally debug a new application on a remote system under control of the standard debugger. +dsfLaunchDelegate.name = GDB (DSF) Automatic Remote Debugging +dsfLaunchDelegate.description = Automatically start and debug a new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). \ No newline at end of file diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.xml b/cross/org.eclipse.cdt.launch.remote/plugin.xml index 9cf37cdd1cf..21bf2341093 100644 --- a/cross/org.eclipse.cdt.launch.remote/plugin.xml +++ b/cross/org.eclipse.cdt.launch.remote/plugin.xml @@ -14,19 +14,10 @@ Anna Dushistova (Mentor Graphics) - code restructuring --> - - - - - - - - - - - - - - - - - - - - @@ -110,14 +70,14 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -125,14 +85,14 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -140,7 +100,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -148,7 +108,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -156,7 +116,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -164,7 +124,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring @@ -172,7 +132,7 @@ Anna Dushistova (Mentor Graphics) - code restructuring diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java index c8ed4252d05..ef325ebbcf0 100644 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java +++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/internal/launch/remote/Activator.java @@ -12,14 +12,7 @@ package org.eclipse.cdt.internal.launch.remote; -import java.util.HashSet; - -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Plugin; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationType; -import org.eclipse.debug.core.ILaunchDelegate; -import org.eclipse.debug.core.ILaunchManager; import org.osgi.framework.BundleContext; /** @@ -30,13 +23,6 @@ public class Activator extends Plugin { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.cdt.launch.remote"; //$NON-NLS-1$ - - private static final String REMOTE_LAUNCH_TYPE = "org.eclipse.rse.remotecdt.RemoteApplicationLaunch"; //$NON-NLS-1$ - - - private static final String PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE = "org.eclipse.rse.remotecdt.dsf.debug"; //$NON-NLS-1$ - - /* The shared instance */ private static Activator plugin; @@ -53,7 +39,6 @@ public class Activator extends Plugin { */ public void start(BundleContext context) throws Exception { super.start(context); - setDefaultLaunchDelegates(); } /* @@ -77,27 +62,4 @@ public class Activator extends Plugin { public static BundleContext getBundleContext() { return getDefault().getBundle().getBundleContext(); } - - private void setDefaultLaunchDelegates() { - // Set the default launch delegates as early as possible, and do it only once (Bug 312997) - ILaunchManager launchMgr = DebugPlugin.getDefault().getLaunchManager(); - - HashSet debugSet = new HashSet(); - debugSet.add(ILaunchManager.DEBUG_MODE); - - ILaunchConfigurationType remoteCfg = launchMgr.getLaunchConfigurationType(REMOTE_LAUNCH_TYPE); - try { - if (remoteCfg.getPreferredDelegate(debugSet) == null) { - ILaunchDelegate[] delegates = remoteCfg.getDelegates(debugSet); - for (ILaunchDelegate delegate : delegates) { - if (PREFERRED_DEBUG_REMOTE_LAUNCH_DELEGATE.equals(delegate.getId())) { - remoteCfg.setPreferredDelegate(debugSet, delegate); - break; - } - } - } - } catch (CoreException e) {} - } - - } diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java deleted file mode 100644 index 996f9b68a8e..00000000000 --- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2010 PalmSource, Inc. and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Ewa Matejska (PalmSource) - Adapted from LocalRunLaunchConfigurationTabGroup - * Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF - * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs - *******************************************************************************/ - -package org.eclipse.cdt.launch.remote.tabs; - -import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; -import org.eclipse.debug.ui.ILaunchConfigurationDialog; -import org.eclipse.debug.ui.ILaunchConfigurationTab; - -/** - * This class defines the tab group for the Remote C++ Launch Configuration. It - * returns an empty set of tabs because all the tabs are contributed via - * launchConfigurationTabs extension point - */ -public class RemoteLaunchConfigurationTabGroup extends - AbstractLaunchConfigurationTabGroup { - public void createTabs(ILaunchConfigurationDialog dialog, String mode) { - ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {}; - setTabs(tabs); - } -} \ No newline at end of file diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF index 098589df549..e53bab92d7c 100644 --- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF +++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/debug/org.eclipse.cdt.debug.core/plugin.properties b/debug/org.eclipse.cdt.debug.core/plugin.properties index 590da5ecd10..8c6f5beeebb 100644 --- a/debug/org.eclipse.cdt.debug.core/plugin.properties +++ b/debug/org.eclipse.cdt.debug.core/plugin.properties @@ -20,6 +20,7 @@ providerName=Eclipse CDT ApplicationLaunch.name=C/C++ Application AttachLaunch.name=C/C++ Attach to Application PostMortemLaunch.name=C/C++ Postmortem Debugger +RemoteApplicationLaunch.name=C/C++ Remote Application CDebugger.name=C/C++ Development Tools Core Debugger Extension BreakpointAction.name=Breakpoint Action Extension diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml index 1e11e0a003f..63c27129be8 100644 --- a/debug/org.eclipse.cdt.debug.core/plugin.xml +++ b/debug/org.eclipse.cdt.debug.core/plugin.xml @@ -28,6 +28,11 @@ name="%PostMortemLaunch.name" public="true"> + + + + + + + + + + @@ -70,7 +70,7 @@ @@ -78,7 +78,7 @@ diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.properties index 2b77094afc7..de9ab3e4630 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.properties @@ -14,9 +14,9 @@ providerName=Eclipse CDT launchDelegate.localApplication.name=GDB (DSF) Create Process launchDelegate.localApplication.description=Start new application under control of GDB debugger integrated using the Debugger Services Framework (DSF). -launchDelegate.remoteApplication.name=GDB (DSF) Remote System Process -launchDelegate.remoteApplication.description=Start new application on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). +launchDelegate.remoteApplication.name=GDB (DSF) Manual Remote Debugging +launchDelegate.remoteApplication.description=Debug a new application that was manually started on a remote system under control of GDB debugger integrated using the Debugger Services Framework (DSF). launchDelegate.attach.name=GDB (DSF) Attach to Process -launchDelegate.attach.description=Attach the GDB debugger, integrated using the Debugger Services Framework (DSF), to a running program. +launchDelegate.attach.description=Attach the GDB debugger, integrated using the Debugger Services Framework (DSF), to a running program locally or remotely. launchDelegate.postmortem.name=GDB (DSF) Postmortem Debugger -launchDelegate.postmortem.description=Load an application dump under into the GDB debugger integrated using the Debugger Services Framework (DSF). +launchDelegate.postmortem.description=Load an application dump using the GDB debugger integrated using the Debugger Services Framework (DSF). diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.xml index 486b9495965..8147ff08548 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.xml +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/plugin.xml @@ -15,7 +15,7 @@