From c5831cdf125ea69b990bfd8ba2aaf4034f2aa303 Mon Sep 17 00:00:00 2001
From: Mikhail Khodjaiants <mikhailkhod@googlemail.com>
Date: Mon, 6 Feb 2006 21:08:44 +0000
Subject: [PATCH] Bug 114793: Add an extension point to contribute command
 factories.

---
 debug/org.eclipse.cdt.debug.mi.core/plugin.xml  | 10 +++++-----
 .../cdt/debug/mi/core/GDBCDIDebugger2.java      | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index 57b6d54a5fe..469ebddde32 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -6,12 +6,12 @@
      <extension
          point="org.eclipse.cdt.debug.core.CDebugger">
       <debugger
-            platform="win32"
-            name="%GDBMIDebugger.name"
-            modes="run,core,attach"
+            class="org.eclipse.cdt.debug.mi.core.GDBCDIDebugger2"
             cpu="native"
-            class="org.eclipse.cdt.debug.mi.core.CygwinGDBCDIDebugger2"
-            id="org.eclipse.cdt.debug.mi.core.CDebuggerNew">
+            id="org.eclipse.cdt.debug.mi.core.CDebuggerNew"
+            modes="run,core,attach"
+            name="%GDBMIDebugger.name"
+            platform="*">
       </debugger>
       <debugger
             platform="win32"
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java
index 22c87911a6d..d2375a309c5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/GDBCDIDebugger2.java
@@ -22,6 +22,7 @@ import org.eclipse.cdt.debug.mi.core.cdi.SharedLibraryManager;
 import org.eclipse.cdt.debug.mi.core.cdi.model.Target;
 import org.eclipse.cdt.debug.mi.core.command.CLITargetAttach;
 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.output.MIInfo;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -112,7 +113,21 @@ public class GDBCDIDebugger2 extends AbstractGDBCDIDebugger {
 	}
 
 	protected void startLocalGDBSession( ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException {
-		
+		// TODO: need a better solution for new-console
+		MISession miSession = getMISession( session );
+		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.
+		}		
 	}
 
 	protected void startAttachGDBSession( ILaunchConfiguration config, Session session, IProgressMonitor monitor ) throws CoreException {