mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 01:36:01 +02:00
[309023] Remove obsolete and redundant CDI debuggers
This commit is contained in:
John Cortell
parent
a60027bd99
commit
f9a4febf5f
5 changed files with 2 additions and 311 deletions
|
|
@ -12,11 +12,9 @@
|
||||||
pluginName=C/C++ Development Tools GDB/MI CDI Debugger Core
|
pluginName=C/C++ Development Tools GDB/MI CDI Debugger Core
|
||||||
providerName=Eclipse CDT
|
providerName=Eclipse CDT
|
||||||
|
|
||||||
GDBDebugger.name=gdb Debugger
|
GDBServer.name=gdbserver
|
||||||
CygwinGDBDebugger.name=Cygwin gdb Debugger
|
|
||||||
GDBServer.name=gdbserver Debugger
|
|
||||||
GDBMIDebugger.name=gdb/mi
|
GDBMIDebugger.name=gdb/mi
|
||||||
MinGWDebugger.name=MinGW gdb Debugger
|
MinGWDebugger.name=MinGW gdb
|
||||||
|
|
||||||
StandardCommandFactory.name=Standard
|
StandardCommandFactory.name=Standard
|
||||||
StandardLinuxCommandFactory.name=Standard (Linux)
|
StandardLinuxCommandFactory.name=Standard (Linux)
|
||||||
|
|
|
||||||
|
|
@ -16,17 +16,6 @@
|
||||||
pattern="cdt\.managedbuild\.config\.gnu\..*">
|
pattern="cdt\.managedbuild\.config\.gnu\..*">
|
||||||
</buildIdPattern>
|
</buildIdPattern>
|
||||||
</debugger>
|
</debugger>
|
||||||
<debugger
|
|
||||||
class="org.eclipse.cdt.debug.mi.core.CygwinGDBCDIDebugger2"
|
|
||||||
cpu="native"
|
|
||||||
id="org.eclipse.cdt.debug.mi.core.CygwinCDebugger"
|
|
||||||
modes="run,core,attach"
|
|
||||||
name="%CygwinGDBDebugger.name"
|
|
||||||
platform="win32">
|
|
||||||
<buildIdPattern
|
|
||||||
pattern="cdt\.managedbuild\.config\.gnu\.cygwin\..*">
|
|
||||||
</buildIdPattern>
|
|
||||||
</debugger>
|
|
||||||
<debugger
|
<debugger
|
||||||
platform="*"
|
platform="*"
|
||||||
name="%GDBServer.name"
|
name="%GDBServer.name"
|
||||||
|
|
@ -34,13 +23,6 @@
|
||||||
cpu="*"
|
cpu="*"
|
||||||
class="org.eclipse.cdt.debug.mi.core.GDBServerCDIDebugger2"
|
class="org.eclipse.cdt.debug.mi.core.GDBServerCDIDebugger2"
|
||||||
id="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"/>
|
id="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger"/>
|
||||||
<debugger
|
|
||||||
class="org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2"
|
|
||||||
cpu="native"
|
|
||||||
id="org.eclipse.cdt.debug.mi.core.CDebugger"
|
|
||||||
modes="run,core,attach"
|
|
||||||
name="%GDBDebugger.name"
|
|
||||||
platform="*"/>
|
|
||||||
<debugger
|
<debugger
|
||||||
class="org.eclipse.cdt.debug.mi.core.MinGWDebugger"
|
class="org.eclipse.cdt.debug.mi.core.MinGWDebugger"
|
||||||
cpu="native"
|
cpu="native"
|
||||||
|
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2000, 2006 QNX Software Systems 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:
|
|
||||||
* QNX Software Systems - Initial API and implementation
|
|
||||||
*******************************************************************************/
|
|
||||||
|
|
||||||
package org.eclipse.cdt.debug.mi.core;
|
|
||||||
|
|
||||||
import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.cdi.Session;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.MIGDBSet;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.factories.win32.CygwinCommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
|
|
||||||
import org.eclipse.core.runtime.CoreException;
|
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
|
||||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cygwin debugger extension point.
|
|
||||||
*/
|
|
||||||
public class CygwinGDBCDIDebugger extends GDBCDIDebugger {
|
|
||||||
|
|
||||||
protected void initializeLibraries(ILaunchConfiguration config, Session session) throws CoreException {
|
|
||||||
// the "search-solib-path" and "stop-on-solib-events" options are not supported in CygWin
|
|
||||||
}
|
|
||||||
|
|
||||||
public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
|
|
||||||
Session session = super.createLaunchSession(config, exe, monitor);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
// For windows we need to start the inferior in a new console window
|
|
||||||
// to separate the Inferior std{in,out,err} from gdb std{in,out,err}
|
|
||||||
try {
|
|
||||||
CommandFactory factory = miSession.getCommandFactory();
|
|
||||||
MIGDBSet set = factory.createMIGDBSet(new String[] { "new-console" }); //$NON-NLS-1$
|
|
||||||
miSession.postCommand(set);
|
|
||||||
MIInfo info = set.getMIInfo();
|
|
||||||
if (info == null) {
|
|
||||||
throw new MIException(MIPlugin.getResourceString("src.common.No_answer")); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
} catch (MIException e) {
|
|
||||||
// We ignore this exception, for example
|
|
||||||
// on GNU/Linux the new-console is an error.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return session;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Session createAttachSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
|
|
||||||
Session session = super.createAttachSession(config, exe, monitor);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
}
|
|
||||||
initializeLibraries(config, session);
|
|
||||||
return session;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Session createCoreSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor) throws CoreException {
|
|
||||||
Session session = super.createCoreSession(config, exe, monitor);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
}
|
|
||||||
initializeLibraries(config, session);
|
|
||||||
return session;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2004, 2006 QNX Software Systems 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:
|
|
||||||
* QNX Software Systems - Initial API and implementation
|
|
||||||
*******************************************************************************/
|
|
||||||
package org.eclipse.cdt.debug.mi.core;
|
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.mi.core.cdi.Session;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.MIGDBSetNewConsole;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.factories.win32.CygwinCommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
|
|
||||||
import org.eclipse.core.runtime.CoreException;
|
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
|
||||||
import org.eclipse.debug.core.ILaunch;
|
|
||||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cygwin debugger extension point.
|
|
||||||
*/
|
|
||||||
public class CygwinGDBCDIDebugger2 extends GDBCDIDebugger2 {
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#getCommandFactory(org.eclipse.debug.core.ILaunchConfiguration)
|
|
||||||
*/
|
|
||||||
protected CommandFactory getCommandFactory( ILaunchConfiguration config ) throws CoreException {
|
|
||||||
return new CygwinCommandFactory( getMIVersion( config ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#doStartSession(org.eclipse.debug.core.ILaunch, org.eclipse.cdt.debug.mi.core.cdi.Session, org.eclipse.core.runtime.IProgressMonitor)
|
|
||||||
*/
|
|
||||||
protected void doStartSession( ILaunch launch, Session session, IProgressMonitor monitor ) throws CoreException {
|
|
||||||
// For windows we need to start the inferior in a new console window
|
|
||||||
// to separate the Inferior std{in,out,err} from gdb std{in,out,err}
|
|
||||||
MISession miSession = getMISession( session );
|
|
||||||
try {
|
|
||||||
CommandFactory factory = miSession.getCommandFactory();
|
|
||||||
MIGDBSetNewConsole newConsole = factory.createMIGDBSetNewConsole();
|
|
||||||
miSession.postCommand( newConsole );
|
|
||||||
MIInfo info = newConsole.getMIInfo();
|
|
||||||
if ( info == null ) {
|
|
||||||
throw new MIException( MIPlugin.getResourceString( "src.common.No_answer" ) ); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch( MIException e ) {
|
|
||||||
// We ignore this exception, for example
|
|
||||||
// on GNU/Linux the new-console is an error.
|
|
||||||
}
|
|
||||||
super.doStartSession( launch, session, monitor );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2#initializeLibraries(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.debug.mi.core.cdi.Session)
|
|
||||||
*/
|
|
||||||
protected void initializeLibraries( ILaunchConfiguration config, Session session ) throws CoreException {
|
|
||||||
// the "search-solib-path" and "stop-on-solib-events" options are not supported in CygWin
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2002, 2006 IBM Corporation 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:
|
|
||||||
* IBM - Initial API and implementation
|
|
||||||
*******************************************************************************/
|
|
||||||
package org.eclipse.cdt.debug.mi.core;
|
|
||||||
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.CDIException;
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.ICDISession;
|
|
||||||
import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.cdi.Session;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.CommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.MIGDBSet;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.command.factories.win32.CygwinCommandFactory;
|
|
||||||
import org.eclipse.cdt.debug.mi.core.output.MIInfo;
|
|
||||||
import org.eclipse.core.resources.IFile;
|
|
||||||
import org.eclipse.core.runtime.IPath;
|
|
||||||
import org.eclipse.debug.core.ILaunchConfiguration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cygwin GDB Debugger overrides the GDB Debugger to apply the Cygwin
|
|
||||||
* Command Factory to the MI Session.
|
|
||||||
*/
|
|
||||||
public class CygwinGDBDebugger extends GDBDebugger {
|
|
||||||
|
|
||||||
protected void initializeLibraries(ILaunchConfiguration config, Session session) throws CDIException {
|
|
||||||
// the "search-solib-path" and "stop-on-solib-events" options are not supported in CygWin
|
|
||||||
}
|
|
||||||
|
|
||||||
public ICDISession createLaunchSession(ILaunchConfiguration config, IFile exe) throws CDIException {
|
|
||||||
Session session = null;
|
|
||||||
boolean failed = false;
|
|
||||||
try {
|
|
||||||
session = (Session) super.createLaunchSession(config, exe);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
// For windows we need to start the inferior in a new console window
|
|
||||||
// to separate the Inferior std{in,out,err} from gdb std{in,out,err}
|
|
||||||
try {
|
|
||||||
CommandFactory factory = miSession.getCommandFactory();
|
|
||||||
MIGDBSet set = factory.createMIGDBSet(new String[] { "new-console" }); //$NON-NLS-1$
|
|
||||||
miSession.postCommand(set);
|
|
||||||
MIInfo info = set.getMIInfo();
|
|
||||||
if (info == null) {
|
|
||||||
throw new MIException(MIPlugin.getResourceString("src.common.No_answer")); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
} catch (MIException e) {
|
|
||||||
// We ignore this exception, for example
|
|
||||||
// on GNU/Linux the new-console is an error.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return session;
|
|
||||||
} catch (CDIException e) {
|
|
||||||
failed = true;
|
|
||||||
throw e;
|
|
||||||
} finally {
|
|
||||||
if (failed) {
|
|
||||||
if (session != null) {
|
|
||||||
try {
|
|
||||||
session.terminate();
|
|
||||||
} catch (Exception ex) {
|
|
||||||
// ignore the exception here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ICDISession createAttachSession(ILaunchConfiguration config, IFile exe, int pid) throws CDIException {
|
|
||||||
Session session = null;
|
|
||||||
boolean failed = false;
|
|
||||||
try {
|
|
||||||
session = (Session) super.createAttachSession(config, exe, pid);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
}
|
|
||||||
initializeLibraries(config, session);
|
|
||||||
return session;
|
|
||||||
} catch (CDIException e) {
|
|
||||||
failed = true;
|
|
||||||
throw e;
|
|
||||||
} finally {
|
|
||||||
if (failed) {
|
|
||||||
if (session != null) {
|
|
||||||
try {
|
|
||||||
session.terminate();
|
|
||||||
} catch (Exception ex) {
|
|
||||||
// ignore the exception here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ICDISession createCoreSession(ILaunchConfiguration config, IFile exe, IPath corefile) throws CDIException {
|
|
||||||
Session session = null;
|
|
||||||
boolean failed = false;
|
|
||||||
try {
|
|
||||||
session = (Session) super.createCoreSession(config, exe, corefile);
|
|
||||||
ICDITarget[] targets = session.getTargets();
|
|
||||||
for (int i = 0; i < targets.length; ++i) {
|
|
||||||
Target target = (Target)targets[i];
|
|
||||||
MISession miSession = target.getMISession();
|
|
||||||
String miVersion = miSession.getCommandFactory().getMIVersion();
|
|
||||||
miSession.setCommandFactory(new CygwinCommandFactory(miVersion));
|
|
||||||
}
|
|
||||||
initializeLibraries(config, session);
|
|
||||||
return session;
|
|
||||||
} catch (CDIException e) {
|
|
||||||
failed = true;
|
|
||||||
throw e;
|
|
||||||
} finally {
|
|
||||||
if (failed) {
|
|
||||||
if (session != null) {
|
|
||||||
try {
|
|
||||||
session.terminate();
|
|
||||||
} catch (Exception ex) {
|
|
||||||
// ignore the exception here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Add table
Reference in a new issue