Attachment 179662 Details for Bug 196154 – reworked fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] reworked fix

patch_232415 (text/plain), 2.38 KB, created by John Cortell

on 2010-09-27 12:19:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Cortell

Created: 2010-09-27 12:19:42 EDT

Size: 2.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java,v
>retrieving revision 1.19
>diff -u -r1.19 MIBreakpointsManager.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java	26 Aug 2010 17:58:47 -0000	1.19
>+++ src/org/eclipse/cdt/dsf/mi/service/MIBreakpointsManager.java	27 Sep 2010 16:17:58 -0000
>@@ -1514,18 +1514,21 @@
>         }
>     }
> 
>-    /**
>-     * See bug232415
>-     * 
>-     * @param path	the absolute path to the source file
>-     * @return
>-     */
>-    private String adjustDebuggerPath(String path) {
>+	/**
>+	 * See bug 232415
>+	 * 
>+	 * @param path
>+	 *            the absolute path to the source file
>+	 * @return the simple filename if running on Windows and [path] is not an
>+	 *         absolute UNIX one. Otherwise, [path] is returned
>+	 */
>+    static String adjustDebuggerPath(String path) {
>     	String result = path;
>     	// Make it MinGW-specific
>     	if (Platform.getOS().startsWith("win")) { //$NON-NLS-1$
>         	if (!path.startsWith("/")) { //$NON-NLS-1$
>-        		result = path.substring(path.lastIndexOf('\\') + 1);
>+        		path = path.replace('\\', '/');
>+        		result = path.substring(path.lastIndexOf('/') + 1);
>         	}
>     	}
>     	return result;
>Index: src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java,v
>retrieving revision 1.28
>diff -u -r1.28 MIRunControl.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	9 Sep 2010 13:20:09 -0000	1.28
>+++ src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	27 Sep 2010 16:17:58 -0000
>@@ -1119,6 +1119,10 @@
> 	 */
> 	public void runToLine(IExecutionDMContext context, String sourceFile,
> 			int lineNumber, boolean skipBreakpoints, RequestMonitor rm) {
>+		
>+		// Hack around a MinGW bug; see 196154
>+		sourceFile = MIBreakpointsManager.adjustDebuggerPath(sourceFile);
>+		
> 		runToLocation(context, sourceFile + ":" + Integer.toString(lineNumber), skipBreakpoints, rm); //$NON-NLS-1$
> 	}
>

Flags:

john.cortell: iplog-

Actions: View | Diff

Attachments on bug 196154: 179524 | 179662