[Esbox-commits] r124 - in trunk/org.indt.esbox.debug: . META-INF src/org/indt/esbox/debug/internal src/org/indt/esbox/debug/ui

[raul at garage.maemo.org]

Author: raul
Date: 2007-10-15 02:16:35 +0300 (Mon, 15 Oct 2007)
New Revision: 124

Modified:
   trunk/org.indt.esbox.debug/META-INF/MANIFEST.MF
   trunk/org.indt.esbox.debug/plugin.xml
   trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxGDBServerCDIDebugger.java
   trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/ui/GDBServerDebuggerPage.java
Log:


Modified: trunk/org.indt.esbox.debug/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.indt.esbox.debug/META-INF/MANIFEST.MF	2007-10-14 23:14:08 UTC (rev 123)
+++ trunk/org.indt.esbox.debug/META-INF/MANIFEST.MF	2007-10-14 23:16:35 UTC (rev 124)
@@ -13,8 +13,6 @@
  org.eclipse.cdt.debug.mi.ui,
  org.eclipse.debug.ui,
  org.indt.esbox.core,
- org.eclipse.cdt.debug.ui,
- org.eclipse.cdt.debug.gdbjtag.ui,
- org.eclipse.cdt,
- org.eclipse.cdt.ui
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.debug.ui
 Eclipse-LazyStart: true

Modified: trunk/org.indt.esbox.debug/plugin.xml
===================================================================
--- trunk/org.indt.esbox.debug/plugin.xml	2007-10-14 23:14:08 UTC (rev 123)
+++ trunk/org.indt.esbox.debug/plugin.xml	2007-10-14 23:16:35 UTC (rev 124)
@@ -19,6 +19,11 @@
             name="ESbox GDB Server Debugger"
             platform="*">
       </debugger>
+      <debugger
+            class="org.indt.esbox.debug.CDIDebugger21"
+            id="esboxGDBRemoteDebugger"
+            name="ESbox GDB Remote Debugger">
+      </debugger>
    </extension>
    <extension
          point="org.eclipse.cdt.debug.ui.CDebuggerPage">
@@ -32,6 +37,11 @@
             debuggerID="esboxGDBServerDebugger"
             id="esboxGDBServerDebuggerPage">
       </debuggerPage>
+      <debuggerPage
+            class="org.indt.esbox.debug.ui.GDBRemoteDebuggerPage"
+            debuggerID="esboxGDBRemoteDebugger"
+            id="esboxGDBRemoteDebuggerPage">
+      </debuggerPage>
    </extension>
 
 </plugin>

Modified: trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxGDBServerCDIDebugger.java
===================================================================
--- trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxGDBServerCDIDebugger.java	2007-10-14 23:14:08 UTC (rev 123)
+++ trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/internal/ESboxGDBServerCDIDebugger.java	2007-10-14 23:16:35 UTC (rev 124)
@@ -35,6 +35,7 @@
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.indt.esbox.core.CoreActivator;
 import org.indt.esbox.core.ESboxPreferenceConstants;
+import org.indt.esbox.core.StreamMonitor;
 import org.indt.esbox.core.scratchbox.ScratchboxCommandLauncher;
 import org.indt.esbox.debug.DebugActivator;
 
@@ -45,14 +46,14 @@
 
 	public static final String ATTR_GDB_SERVER = ICDTLaunchConfigurationConstants.CDT_LAUNCH_ID + ".gdb_server"; //$NON-NLS-1$
 
-	public static final boolean GDB_SERVER_DEFAULT = false;	
+	public static final boolean GDB_SERVER_DEFAULT = true;	
 		
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.mi.core.GDBCDIDebugger#createLaunchSession(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.cdt.core.IBinaryParser.IBinaryExecutable, org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public Session createLaunchSession(ILaunchConfiguration config, IBinaryObject exe, IProgressMonitor monitor)
 			throws CoreException {
-			
+				
 		boolean gdbserver = GDB_SERVER_DEFAULT;
 
 		try {
@@ -159,7 +160,7 @@
 				
 		// check if command exist
 		if (command.length() > 0) {
-			command = command.replaceAll("\\$\\{binary\\}", exe.getName());			
+			command = command.replaceAll("\\$\\{BINARY\\}", exe.getName());			
 			Path cmd = new Path(command);
 			
 			Process p = launcher.execute(cmd, new String[] {},
@@ -169,10 +170,10 @@
 				System.out.println("Error starting GDB server inside Scratchbox");
 			}
 
-//			// print all output to console
-//			new SbStreamMonitor(p.getInputStream(), true, new String("Starting GDB server inside Scratchbox"));
-//			// print all errors to console
-//			new SbStreamMonitor(p.getErrorStream(), false, null);
+			// print all output to console
+			new StreamMonitor(p.getInputStream(), true, new String("Starting GDB server inside Scratchbox"));
+			// print all errors to console
+			new StreamMonitor(p.getErrorStream(), false, null);
 		}
 	}	
 	

Modified: trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/ui/GDBServerDebuggerPage.java
===================================================================
--- trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/ui/GDBServerDebuggerPage.java	2007-10-14 23:14:08 UTC (rev 123)
+++ trunk/org.indt.esbox.debug/src/org/indt/esbox/debug/ui/GDBServerDebuggerPage.java	2007-10-14 23:16:35 UTC (rev 124)
@@ -54,7 +54,7 @@
 
 	private ComboDialogField fConnectionField;
 
-	private String[] fConnections = new String[]{ CONNECTION_TCP, CONNECTION_SERIAL };
+	private String[] fConnections = new String[] { CONNECTION_TCP, CONNECTION_SERIAL };
 
 	private TCPSettingsBlock fTCPBlock;
 
@@ -94,7 +94,7 @@
 		GridData gd = new GridData();
 		label.setLayoutData( gd );
 
-		fGDBServerButton = createCheckButton(comp, "Start GDBServer Automatically."); 
+		fGDBServerButton = createCheckButton(comp, "Start gdbServer in Scratchbox automatically");
 		fGDBServerButton.setSelection(ESboxGDBServerCDIDebugger.GDB_SERVER_DEFAULT);
 		fGDBServerButton.addSelectionListener(new SelectionAdapter() {
 
@@ -103,6 +103,7 @@
 
 			}
 		});
+		
 				
 		fGDBCommandText = ControlFactory.createTextField( subComp, SWT.SINGLE | SWT.BORDER );
 		fGDBCommandText.addModifyListener( new ModifyListener() {
@@ -176,6 +177,7 @@
 			}
 		} );
 		extendMainTab( comp );
+		createProtocolCombo( subComp );
 	}
 
 	/*
@@ -286,8 +288,9 @@
 
 	public void setDefaults( ILaunchConfigurationWorkingCopy configuration ) {
 		super.setDefaults( configuration );
-		configuration.setAttribute( IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP, false );
+		configuration.setAttribute( IGDBServerMILaunchConfigurationConstants.ATTR_REMOTE_TCP, true );
 		fTCPBlock.setDefaults( configuration );
+		configuration.setAttribute( IGDBServerMILaunchConfigurationConstants.ATTR_PORT, "1234" );
 		fSerialBlock.setDefaults( configuration );
     	configuration.setAttribute(ESboxGDBServerCDIDebugger.ATTR_GDB_SERVER,
     			ESboxGDBServerCDIDebugger.GDB_SERVER_DEFAULT);