Commit fda652a4 authored by hjk's avatar hjk Committed by hjk

debugger: rename gdbmacros* to dumper*

Was mis-named from the beginning.

(cherry picked from commit 2f119dc2f85b28274d47ff635188872d5ed11521)

Change-Id: I4f2e388edfdded117c5b35d3d04bbdc68d77afa4
Reviewed-on: http://codereview.qt.nokia.com/872Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 6244008d
......@@ -8840,7 +8840,7 @@
Qt's bootstrapped applications (such as moc and qmake) are built in a way
that is incompatible with the default build of the debugging helpers. To
work around this, add gdbmacros.cpp to the compiled sources in the
work around this, add \c{dumper.cpp} to the compiled sources in the
application Makefile.
Choose \gui {Tools > Options > Debugger > Debugging Helper > Use debugging
......
......@@ -109,7 +109,7 @@
#else
# include "gdbmacros_p.h"
# include "dumper_p.h"
#endif // QT_BOOTSTRAPPED
......
......@@ -4,7 +4,7 @@ linux-* {
CONFIG -= release
CONFIG += debug
}
SOURCES = gdbmacros.cpp
SOURCES = dumper.cpp
false {
DEFINES += USE_QT_GUI=0
QT = core
......@@ -15,4 +15,4 @@ else {
gui
}
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += HAS_QOBJECT_P_H
HEADERS += gdbmacros_p.h
HEADERS += dumper.h
......@@ -11,7 +11,7 @@ CONFIG -= app_bundle
TEMPLATE = app
SOURCES += main.cpp \
../gdbmacros.cpp
../dumper.cpp
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h) {
DEFINES+=HAS_QOBJECT_P_H
......
......@@ -32,7 +32,7 @@ DATA_DIRS = \
schemes \
styles \
rss \
gdbmacros \
dumper \
qmldesigner \
qmlicons \
qml \
......
......@@ -7109,14 +7109,14 @@ Soubory</translation>
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation type="obsolete">Laděný spustitelný soubor neobsahuje informace potřebné pro hezké zobrazení datových typů Qt.
Ujistěte se, že používáte něco na způsob
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
ve svém .pro souboru.</translation>
</message>
......
......@@ -7925,14 +7925,14 @@ Skipping file.</source>
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation>El binario en depuración no contiene la información necesaria para desplegar tipos de datos de Qt.
Asegúrese de tener una línea como ésta
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
en su archivo .pro.</translation>
</message>
......
......@@ -9687,14 +9687,14 @@ est ignorée, et un seul &apos;Entrer dans&apos; pour l&apos;émission d&apos;un
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation type="obsolete">Le fichier binaire débogué ne contient pas les informations nécessaires pour l&apos;affichage correct des types de données Qt.
Assurez-vous que vous utilisez quelque chose comme
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
dans votre fichier .pro.</translation>
</message>
......@@ -10918,14 +10918,14 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation>A debuggolt bináris fájl nem tartalmazza a szükséges információkat a Qt adattípus megfelelő kijelzéséhez.(new line)
(new line)
Győzödjön meg róla, hogy valami hasonló van a(new line)
(new line)
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp(new line)
SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
(new line)
.pro fájlban.</translation>
</message>
......
......@@ -7894,14 +7894,14 @@ Causa: %3</translation>
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation>L&apos;eseguibile di cui si sta facendo il debug non contiene le informazioni necessarie alla visualizzazione dei tipi di dati Qt.
Puoi risolvere inserendo qualcosa tipo
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
nel tuo file .pro.</translation>
</message>
......
......@@ -9176,14 +9176,14 @@ on slow machines. In this case, the value should be increased.</source>
Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
in your .pro file.</source>
<translation type="obsolete">被调试的程序未包含用于正确显示Qt数据类型的信息。
请确保使用添加类似如下信息
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
SOURCES *= .../ide/main/bin/dumper/dumper.cpp
到你的.pro文件中。</translation>
</message>
......@@ -310,9 +310,10 @@ QString BuildableHelperLibrary::byInstallDataHelper(const QString &sourcePath,
}
}
// We pretend that the lastmodified of gdbmacros.cpp is 5 minutes before what the file system says
// Because afer a installation from the package the modified dates of gdbmacros.cpp
// and the actual library are close to each other, but not deterministic in one direction
// We pretend that the lastmodified of dumper.cpp is 5 minutes before what
// the file system says because afer a installation from the package the
// modified dates of dumper.cpp and the actual library are close to each
// other, but not deterministic in one direction.
if (sourcesModified.isValid())
sourcesModified = sourcesModified.addSecs(-300);
......
......@@ -22,5 +22,5 @@ true {
QT = core gui
}
SOURCES += ../../../share/qtcreator/gdbmacros/gdbmacros.cpp
SOURCES += ../../../share/qtcreator/dumper/dumper.cpp
......@@ -1171,8 +1171,8 @@ void GdbEngine::handleQuerySources(const GdbResponse &response)
QMap<QString, QString> oldShortToFull = m_shortToFullName;
m_shortToFullName.clear();
m_fullToShortName.clear();
// "^done,files=[{file="../../../../bin/gdbmacros/gdbmacros.cpp",
// fullname="/data5/dev/ide/main/bin/gdbmacros/gdbmacros.cpp"},
// "^done,files=[{file="../../../../bin/dumper/dumper.cpp",
// fullname="/data5/dev/ide/main/bin/dumper/dumper.cpp"},
GdbMi files = response.data.findChild("files");
foreach (const GdbMi &item, files.children()) {
GdbMi fullName = item.findChild("fullname");
......@@ -4724,7 +4724,7 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint)
void GdbEngine::loadPythonDumpers()
{
const QByteArray dumperSourcePath =
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
postCommand("python execfile('" + dumperSourcePath + "bridge.py')",
ConsoleCommand|NonCriticalResponse);
......
......@@ -214,7 +214,7 @@ void PdbEngine::runEngine()
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
showStatusMessage(tr("Running requested..."), 5000);
const QByteArray dumperSourcePath =
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/gdbmacros/";
Core::ICore::instance()->resourcePath().toLocal8Bit() + "/dumper/";
QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
postDirectCommand("import sys");
postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
......
......@@ -51,9 +51,9 @@ using namespace ProjectExplorer;
static inline QStringList validBinaryFilenames()
{
return QStringList()
<< QLatin1String("debug/gdbmacros.dll")
<< QLatin1String("libgdbmacros.dylib")
<< QLatin1String("libgdbmacros.so");
<< QLatin1String("debug/dumper.dll")
<< QLatin1String("libdumper.dylib")
<< QLatin1String("libdumper.so");
}
QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QString &qtInstallData)
......@@ -82,14 +82,14 @@ QStringList DebuggingHelperLibrary::locationsByInstallData(const QString &qtInst
static QString sourcePath()
{
return Core::ICore::instance()->resourcePath() + QLatin1String("/gdbmacros/");
return Core::ICore::instance()->resourcePath() + QLatin1String("/dumper/");
}
static QStringList sourceFileNames()
{
return QStringList()
<< QLatin1String("gdbmacros.cpp") << QLatin1String("gdbmacros_p.h")
<< QLatin1String("gdbmacros.h") << QLatin1String("gdbmacros.pro")
<< QLatin1String("dumper.cpp") << QLatin1String("dumper_p.h")
<< QLatin1String("dumper.h") << QLatin1String("dumper.pro")
<< QLatin1String("LICENSE.LGPL") << QLatin1String("LGPL_EXCEPTION.TXT");
}
......@@ -127,7 +127,7 @@ QString DebuggingHelperLibrary::copy(const QString &qtInstallData,
bool DebuggingHelperLibrary::build(BuildHelperArguments arguments, QString *log, QString *errorMessage)
{
arguments.proFilename = QLatin1String("gdbmacros.pro");
arguments.proFilename = QLatin1String("dumper.pro");
arguments.helperName = QCoreApplication::translate("ProjectExplorer::DebuggingHelperLibrary",
"GDB helper");
return buildHelper(arguments, log, errorMessage);
......
......@@ -367,13 +367,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QList<ProjectExplorer::Task>()
<< QString();
QTest::newRow("note")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR
<< QString() << QString()
<< ( QList<ProjectExplorer::Task>()
<< Task(Task::Unknown,
QLatin1String("initialized from here"),
QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp"), 1079,
QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp"), 1079,
Constants::TASK_CATEGORY_COMPILE))
<< QString();
QTest::newRow("static member function")
......
......@@ -318,9 +318,9 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QStringList();
QTest::newRow("pass-trough note")
<< QStringList()
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR
<< QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/gdbmacros/gdbmacros.cpp:1079: note: initialized from here\n")
<< QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here\n")
<< QList<ProjectExplorer::Task>()
<< QString()
<< QStringList();
......
......@@ -3,11 +3,11 @@ include($$IDE_SOURCE_TREE/src/libs/symbianutils/symbianutils.pri)
DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
UTILSDIR = $$IDE_SOURCE_TREE/src/libs
MACROSDIR = $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros
MACROSDIR = $$IDE_SOURCE_TREE/share/qtcreator/dumper
SOURCES += \
$$DEBUGGERDIR/gdb/gdbmi.cpp \
$$MACROSDIR/gdbmacros.cpp \
$$MACROSDIR/dumper.cpp \
tst_dumpers.cpp \
DEFINES += MACROSDEBUG
......
......@@ -35,8 +35,8 @@
#undef private
#include "gdb/gdbmi.h"
#include "gdbmacros.h"
#include "gdbmacros_p.h"
#include "dumper.h"
#include "dumper_p.h"
#include "json.h"
......@@ -2277,7 +2277,7 @@ void tst_Dumpers::dumpQSharedPointer()
// Case 2: Composite type.
// Case 1.1: Null pointer.
QSharedPointer<QString> compositePtr;
// TODO: This case is not handled in gdbmacros.cpp (segfault!)
// TODO: This case is not handled in dumper.cpp (segfault!)
//dumpQSharedPointerHelper(compoistePtr);
// Case 1.2: Non-null pointer,
......
......@@ -398,8 +398,9 @@ GdbWrapper::GdbWrapper(tst_Gdb *test) : m_test(test)
connect(&m_proc, SIGNAL(readyReadStandardError()),
this, SLOT(readStandardError()));
m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/dumper.py')\n");
m_proc.write("python execfile('../../../share/qtcreator/gdbmacros/gdbmacros.py')\n");
m_proc.write("python execfile('../../../share/qtcreator/dumper/bridge.py')\n");
m_proc.write("python execfile('../../../share/qtcreator/dumper/dumper.py')\n");
m_proc.write("python execfile('../../../share/qtcreator/dumper/qttypes.py')\n");
m_proc.write("bbsetup\n");
m_proc.write("break breaker\n");
m_proc.write("handle SIGSTOP stop pass\n");
......
......@@ -2,5 +2,5 @@ include(../../../../qtcreator.pri)
TEMPLATE = app
win32:DEFINES += _CRT_SECURE_NO_WARNINGS
SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/gdbmacros/gdbmacros.cpp
SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/dumper/dumper.cpp
SOURCES += main.cpp
......@@ -720,7 +720,7 @@ struct Function
void testFunction()
{
// In order to use this, switch on the 'qDump__Function' in gdbmacros.py
// In order to use this, switch on the 'qDump__Function' in dumper.py
Function func("x", "sin(x)", 0, 1);
func.max = 10;
func.f = "cos(x)";
......
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