From c7d0fd2ccbd9042a22acd1b58af7df2731794051 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 11 Jan 2010 22:13:42 +0000 Subject: [PATCH] [299292] Version fix for Fedora GDB --- .../src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java index 7b6167f3141..1e218719163 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java @@ -225,11 +225,12 @@ public class LaunchUtils { // GNU gdb 6.8.50.20080730 // GNU gdb (GDB) 6.8.50.20080730-cvs // GNU gdb (Ericsson GDB 1.0-10) 6.8.50.20080730-cvs - Pattern pattern = Pattern.compile(" gdb( \\(.*?\\))? (\\d*(\\.\\d*)*)", Pattern.MULTILINE); //$NON-NLS-1$ + // GNU gdb (GDB) Fedora (7.0-3.fc12) + Pattern pattern = Pattern.compile(" gdb( \\(.*?\\))? (\\w* )?\\(?(\\d*(\\.\\d*)*)", Pattern.MULTILINE); //$NON-NLS-1$ Matcher matcher = pattern.matcher(versionOutput); if (matcher.find()) { - version = matcher.group(2); + version = matcher.group(3); // Temporary for cygwin, until GDB 7 is released // Any cygwin GDB staring with 6.8 should be treated as plain 6.8 if (versionOutput.toLowerCase().indexOf("cygwin") != -1 && //$NON-NLS-1$