Commit 394045b2 authored by hjk's avatar hjk

Debugger: Export Debugger::DebuggerItem to fix BlackBerry setup

Task-number: QTCREATORBUG-10189
Change-Id: Icddd09a1a931371133a1d03ca8cf600e76295eac
Reviewed-by: default avatarDavid Kaspar <dkaspar@blackberry.com>
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 938b67af
......@@ -791,8 +791,7 @@ void AndroidConfigurations::updateAutomaticKitList()
ToolChainKitInformation::setToolChain(newKit, tc);
QtSupport::QtKitInformation::setQtVersion(newKit, qt);
DeviceKitInformation::setDevice(newKit, device);
Debugger::DebuggerKitInformation::setDebugger(newKit,
Debugger::GdbEngineType, tc->suggestedDebugger());
Debugger::DebuggerKitInformation::setDebugger(newKit, tc->suggestedDebugger());
AndroidGdbServerKitInformation::setGdbSever(newKit, tc->suggestedGdbServer());
newKit->makeSticky();
newKits << newKit;
......
......@@ -53,7 +53,6 @@ QT_END_NAMESPACE
namespace Debugger {
namespace Internal {
class DebuggerItem;
class DebuggerItemConfigWidget;
class DebuggerKitConfigWidget;
......@@ -70,8 +69,8 @@ public:
~DebuggerItemManager();
static const DebuggerItem *debuggerFromKit(const ProjectExplorer::Kit *kit);
void setDebugger(ProjectExplorer::Kit *kit,
DebuggerEngineType type, const Utils::FileName &command);
// Returns id.
QVariant registerDebugger(const DebuggerItem &item);
QModelIndex currentIndex() const;
void setCurrentIndex(const QModelIndex &index);
......
......@@ -26,3 +26,161 @@
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "debuggerkitinformation.h"
#include "debuggerkitconfigwidget.h"
#include <projectexplorer/abi.h>
#include <utils/fileutils.h>
#include <QProcess>
using namespace Debugger::Internal;
using namespace ProjectExplorer;
using namespace Utils;
static const char DEBUGGER_INFORMATION_COMMAND[] = "Binary";
static const char DEBUGGER_INFORMATION_DISPLAYNAME[] = "DisplayName";
static const char DEBUGGER_INFORMATION_ID[] = "Id";
static const char DEBUGGER_INFORMATION_ENGINETYPE[] = "EngineType";
static const char DEBUGGER_INFORMATION_AUTODETECTED[] = "AutoDetected";
static const char DEBUGGER_INFORMATION_ABIS[] = "Abis";
namespace Debugger {
// --------------------------------------------------------------------------
// DebuggerItem
// --------------------------------------------------------------------------
DebuggerItem::DebuggerItem()
{
m_engineType = NoEngineType;
m_isAutoDetected = false;
}
void DebuggerItem::reinitializeFromFile()
{
QProcess proc;
proc.start(m_command.toString(), QStringList() << QLatin1String("--version"));
proc.waitForStarted();
proc.waitForFinished();
QByteArray ba = proc.readAll();
if (ba.contains("gdb")) {
m_engineType = GdbEngineType;
// const char needle[] = "This GDB was configured as \"";
// int pos1 = ba.indexOf(needle);
// if (pos1 != -1) {
// pos1 += sizeof(needle);
// int pos2 = ba.indexOf('"', pos1 + 1);
// QByteArray target = ba.mid(pos1, pos2 - pos1);
// abis.append(Abi::abiFromTargetTriplet(target)); // FIXME: Doesn't exist yet.
// }
m_abis = Abi::abisOfBinary(m_command); // FIXME: Wrong.
return;
}
if (ba.contains("lldb")) {
m_engineType = LldbEngineType;
m_abis = Abi::abisOfBinary(m_command);
return;
}
if (ba.startsWith("Python")) {
m_engineType = PdbEngineType;
return;
}
m_engineType = NoEngineType;
}
QString DebuggerItem::engineTypeName() const
{
switch (m_engineType) {
case Debugger::NoEngineType:
return DebuggerOptionsPage::tr("Not recognized");
case Debugger::GdbEngineType:
return QLatin1String("GDB");
case Debugger::CdbEngineType:
return QLatin1String("CDB");
case Debugger::LldbEngineType:
return QLatin1String("LLDB");
default:
return QString();
}
}
QStringList DebuggerItem::abiNames() const
{
QStringList list;
foreach (const Abi &abi, m_abis)
list.append(abi.toString());
return list;
}
QVariantMap DebuggerItem::toMap() const
{
QVariantMap data;
data.insert(QLatin1String(DEBUGGER_INFORMATION_DISPLAYNAME), m_displayName);
data.insert(QLatin1String(DEBUGGER_INFORMATION_ID), m_id);
data.insert(QLatin1String(DEBUGGER_INFORMATION_COMMAND), m_command.toUserOutput());
data.insert(QLatin1String(DEBUGGER_INFORMATION_ENGINETYPE), int(m_engineType));
data.insert(QLatin1String(DEBUGGER_INFORMATION_AUTODETECTED), m_isAutoDetected);
data.insert(QLatin1String(DEBUGGER_INFORMATION_ABIS), abiNames());
return data;
}
void DebuggerItem::fromMap(const QVariantMap &data)
{
m_command = FileName::fromUserInput(data.value(QLatin1String(DEBUGGER_INFORMATION_COMMAND)).toString());
m_id = data.value(QLatin1String(DEBUGGER_INFORMATION_ID)).toString();
m_displayName = data.value(QLatin1String(DEBUGGER_INFORMATION_DISPLAYNAME)).toString();
m_isAutoDetected = data.value(QLatin1String(DEBUGGER_INFORMATION_AUTODETECTED)).toBool();
m_engineType = DebuggerEngineType(data.value(QLatin1String(DEBUGGER_INFORMATION_ENGINETYPE)).toInt());
m_abis.clear();
foreach (const QString &a, data.value(QLatin1String(DEBUGGER_INFORMATION_ABIS)).toStringList()) {
Abi abi(a);
if (abi.isValid())
m_abis.append(abi);
}
}
void DebuggerItem::setId(const QVariant &id)
{
m_id = id;
}
void DebuggerItem::setDisplayName(const QString &displayName)
{
m_displayName = displayName;
}
void DebuggerItem::setEngineType(const DebuggerEngineType &engineType)
{
m_engineType = engineType;
}
void DebuggerItem::setCommand(const Utils::FileName &command)
{
m_command = command;
}
void DebuggerItem::setAutoDetected(bool isAutoDetected)
{
m_isAutoDetected = isAutoDetected;
}
void DebuggerItem::setAbis(const QList<ProjectExplorer::Abi> &abis)
{
m_abis = abis;
}
void DebuggerItem::setAbi(const Abi &abi)
{
m_abis.clear();
m_abis.append(abi);
}
bool Debugger::DebuggerItem::isValid() const
{
return m_engineType != NoEngineType;
}
} // namespace Debugger;
......@@ -38,6 +38,53 @@
namespace Debugger {
namespace Internal { class DebuggerItemManager; }
class DEBUGGER_EXPORT DebuggerItem
{
public:
DebuggerItem();
bool canClone() const { return true; }
bool isValid() const;
QString engineTypeName() const;
QVariantMap toMap() const;
void fromMap(const QVariantMap &data);
void reinitializeFromFile();
QVariant id() const { return m_id; }
QString displayName() const { return m_displayName; }
void setDisplayName(const QString &displayName);
DebuggerEngineType engineType() const { return m_engineType; }
void setEngineType(const DebuggerEngineType &engineType);
Utils::FileName command() const { return m_command; }
void setCommand(const Utils::FileName &command);
bool isAutoDetected() const { return m_isAutoDetected; }
void setAutoDetected(bool isAutoDetected);
QList<ProjectExplorer::Abi> abis() const { return m_abis; }
void setAbis(const QList<ProjectExplorer::Abi> &abis);
void setAbi(const ProjectExplorer::Abi &abi);
QStringList abiNames() const;
private:
friend class Debugger::Internal::DebuggerItemManager;
void setId(const QVariant &id);
QVariant m_id;
QString m_displayName;
DebuggerEngineType m_engineType;
Utils::FileName m_command;
bool m_isAutoDetected;
QList<ProjectExplorer::Abi> m_abis;
};
class DEBUGGER_EXPORT DebuggerKitInformation : public ProjectExplorer::KitInformation
{
Q_OBJECT
......@@ -59,8 +106,8 @@ public:
ItemList toUserOutput(const ProjectExplorer::Kit *k) const;
static void setDebugger(ProjectExplorer::Kit *k,
DebuggerEngineType type, const Utils::FileName &command);
static void setDebugger(ProjectExplorer::Kit *k, const DebuggerItem &item);
static void setDebugger(ProjectExplorer::Kit *k, const Utils::FileName &command);
static Core::Id id();
static Utils::FileName debuggerCommand(const ProjectExplorer::Kit *k);
......
......@@ -263,17 +263,27 @@ Kit *BlackBerryConfiguration::createKit(QnxArchitecture arch, BaseQtVersion *qtV
Kit *kit = new Kit;
QtKitInformation::setQtVersion(kit, qtVersion);
ToolChainKitInformation::setToolChain(kit, tc);
QString versionName = QString::fromLatin1("%1 - %2").arg(qtVersion->qtVersionString(), m_targetName);
Debugger::DebuggerItem debugger;
debugger.setCommand(arch == X86 ? m_simulatorDebuger : m_deviceDebuger);
debugger.setEngineType(Debugger::GdbEngineType);
debugger.setDisplayName(arch == X86
? tr("BlackBerry Debugger (%1) - Simulator").arg(versionName)
: tr("BlackBerry Debugger (%1) - Device").arg(versionName));
debugger.setAutoDetected(true);
debugger.setAbi(tc->targetAbi());
Debugger::DebuggerKitInformation::setDebugger(kit, debugger);
if (arch == X86) {
Debugger::DebuggerKitInformation::setDebugger(kit, Debugger::GdbEngineType, m_simulatorDebuger);
Qt4ProjectManager::QmakeKitInformation::setMkspec(kit, FileName::fromString(QString::fromLatin1("blackberry-x86-qcc")));
// TODO: Check if the name already exists(?)
kit->setDisplayName(tr("BlackBerry 10 (%1 - %2) - Simulator").arg(qtVersion->qtVersionString(), m_targetName));
kit->setDisplayName(tr("BlackBerry 10 (%1) - Simulator").arg(versionName));
} else {
Debugger::DebuggerKitInformation::setDebugger(kit, Debugger::GdbEngineType, m_deviceDebuger);
kit->setDisplayName(tr("BlackBerry 10 (%1 - %2)").arg(qtVersion->qtVersionString(), m_targetName));
kit->setDisplayName(tr("BlackBerry 10 (%1)").arg(versionName));
}
kit->setAutoDetected(m_isAutoDetected);
kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_BB_CATEGORY_ICON)));
kit->setMutable(DeviceKitInformation::id(), true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment