File robust-gdb-version-parsing.patch of Package qt-creator

Overview Repositories Revisions Requests Users Attributes Meta

File robust-gdb-version-parsing.patch of Package qt-creator (Revision e860e376fbab813e19df4659cedd2517)

Currently displaying revision e860e376fbab813e19df4659cedd2517 , Show latest

--- src/plugins/debugger/gdb/gdbengine.cpp
+++ src/plugins/debugger/gdb/gdbengine.cpp
@@ -1389,45 +1389,22 @@
 
 void GdbEngine::handleShowVersion(const GdbResponse &response)
 {
- //qDebug () << "VERSION 2:" << response.data.findChild("consolestreamoutput").data();
- //qDebug () << "VERSION:" << response.toString();
- debugMessage(_("VERSION: " + response.toString()));
+ debugMessage(_("PARSING VERSION: " + response.toString()));
 if (response.resultClass == GdbResultDone) {
 m_gdbVersion = 100;
 m_gdbBuildVersion = -1;
 m_isMacGdb = false;
- QString msg = QString::fromLocal8Bit(response.data.findChild("consolestreamoutput").data());
- QRegExp supported(_("GNU gdb(.*) (\\d+)\\.(\\d+)(\\.(\\d+))?(-(\\d+))?"));
- if (supported.indexIn(msg) == -1) {
+ GdbMi version = response.data.findChild("consolestreamoutput");
+ QString msg = QString::fromLocal8Bit(version.data());
+ extractGdbVersion(msg,
+ &m_gdbVersion, &m_gdbBuildVersion, &m_isMacGdb);
+ if (m_gdbVersion > 60500 && m_gdbVersion < 200000)
+ debugMessage(_("SUPPORTED GDB VERSION ") + msg);
+ else
 debugMessage(_("UNSUPPORTED GDB VERSION ") + msg);
-#if 0
- QStringList list = msg.split(_c('\n'));
- while (list.size() > 2)
- list.removeLast();
- msg = tr("The debugger you are using identifies itself as:")
- + _("") + list.join(_(" ")) + _("")
- + tr("This version is not officially supported by Qt Creator.\n"
- "Debugging will most likely not work well.\n"
- "Using gdb 6.7 or later is strongly recommended.");
-#if 0
- // ugly, but 'Show again' check box...
- static QErrorMessage *err = new QErrorMessage(mainWindow());
- err->setMinimumSize(400, 300);
- err->showMessage(msg);
-#else
- //showMessageBox(QMessageBox::Information, tr("Warning"), msg);
-#endif
-#endif
- } else {
- m_gdbVersion = 10000 * supported.cap(2).toInt()
- + 100 * supported.cap(3).toInt()
- + 1 * supported.cap(5).toInt();
- m_gdbBuildVersion = supported.cap(7).toInt();
- m_isMacGdb = msg.contains(__("Apple version"));
- debugMessage(_("GDB VERSION: %1, BUILD: %2%3").arg(m_gdbVersion)
- .arg(m_gdbBuildVersion).arg(_(m_isMacGdb ? " (APPLE)" : "")));
- }
- //qDebug () << "VERSION 3:" << m_gdbVersion << m_gdbBuildVersion;
+
+ debugMessage(_("USING GDB VERSION: %1, BUILD: %2%3").arg(m_gdbVersion)
+ .arg(m_gdbBuildVersion).arg(_(m_isMacGdb ? " (APPLE)" : "")));
 }
 }
 
--- src/plugins/debugger/gdb/gdbmi.cpp
+++ src/plugins/debugger/gdb/gdbmi.cpp
@@ -32,6 +32,7 @@
 #include <utils/qtcassert.h>
 
 #include <QtCore/QByteArray>
+#include <QtCore/QRegExp>
 #include <QtCore/QTextStream>
 
 #include <ctype.h>
@@ -387,5 +388,50 @@
 return result;
 }
 
+
+//////////////////////////////////////////////////////////////////////////////////
+//
+// GdbResponse
+//
+//////////////////////////////////////////////////////////////////////////////////
+
+void extractGdbVersion(const QString &msg,
+ int *gdbVersion, int *gdbBuildVersion, bool *isMacGdb)
+{
+ const QChar dot(QLatin1Char('.'));
+
+ QString cleaned;
+ QString build;
+ bool inClean = true;
+ foreach (QChar c, msg) {
+ if (inClean && !cleaned.isEmpty() && c != dot && (c.isPunct() || c.isSpace()))
+ inClean = false;
+ if (inClean) {
+ if (c.isDigit())
+ cleaned.append(c);
+ else if (!cleaned.isEmpty() && !cleaned.endsWith(dot))
+ cleaned.append(dot);
+ } else {
+ if (c.isDigit())
+ build.append(c);
+ else if (!build.isEmpty() && !build.endsWith(dot))
+ build.append(dot);
+ }
+ }
+
+ *isMacGdb = msg.contains(QLatin1String("Apple version"));
+
+ *gdbVersion = 10000 * cleaned.section(dot, 0, 0).toInt()
+ + 100 * cleaned.section(dot, 1, 1).toInt()
+ + 1 * cleaned.section(dot, 2, 2).toInt();
+ if (cleaned.count(dot) >= 3)
+ *gdbBuildVersion = cleaned.section(dot, 3, 3).toInt();
+ else
+ *gdbBuildVersion = build.section(dot, 0, 0).toInt();
+
+ if (*isMacGdb)
+ *gdbBuildVersion = build.section(dot, 1, 1).toInt();
+}
+
 } // namespace Internal
 } // namespace Debugger
--- src/plugins/debugger/gdb/gdbmi.h
+++ src/plugins/debugger/gdb/gdbmi.h
@@ -168,6 +168,9 @@
 QVariant cookie;
 };
 
+void extractGdbVersion(const QString &msg,
+ int *gdbVersion, int *gdbBuildVersion, bool *isMacGdb);
+
 } // namespace Internal
 } // namespace Debugger

Places

File robust-gdb-version-parsing.patch of Package qt-creator (Revision e860e376fbab813e19df4659cedd2517)

Places