Commit c372f7b6 authored by hjk's avatar hjk
Browse files

Rename share/dumper to share/debugger and {l,g}bridge to {lldb,gdb}bridge



Change-Id: I56a09dd89d2ac086ee264432510fd39b5efe69c5
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent ac7a7f83
......@@ -202,8 +202,8 @@ int qtGhVersion = QT_VERSION;
QT_BEGIN_NAMESPACE
#endif
const char *stdStringTypeC = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
const char *stdWideStringTypeUShortC = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
const char stdStringTypeC[] = "std::basic_string<char,std::char_traits<char>,std::allocator<char> >";
const char stdWideStringTypeUShortC[] = "std::basic_string<unsigned short,std::char_traits<unsigned short>,std::allocator<unsigned short> >";
#if defined(QT_BEGIN_NAMESPACE)
QT_END_NAMESPACE
......
......@@ -1517,7 +1517,7 @@ def testit1():
# Used in dumper auto test.
# Usage: python lbridge.py /path/to/testbinary comma-separated-inames
# Usage: python lldbbridge.py /path/to/testbinary comma-separated-inames
def testit():
db = Dumper()
......
......@@ -32,7 +32,7 @@ DATA_DIRS = \
schemes \
styles \
rss \
dumper \
debugger \
qmldesigner \
qmlicons \
qml \
......
......@@ -20,5 +20,5 @@ true {
QT = core gui
}
SOURCES += ../../../share/qtcreator/dumper/dumper.cpp
SOURCES += ../../../share/qtcreator/debugger/dumper.cpp
......@@ -4987,10 +4987,10 @@ void GdbEngine::tryLoadPythonDumpers()
m_pythonAttemptedToLoad = true;
const QByteArray dumperSourcePath =
Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
Core::ICore::resourcePath().toLocal8Bit() + "/debugger/";
postCommand("python sys.path.insert(1, '" + dumperSourcePath + "')", ConsoleCommand);
postCommand("python from gbridge import *", ConsoleCommand, CB(handlePythonSetup));
postCommand("python from gdbbridge import *", ConsoleCommand, CB(handlePythonSetup));
}
void GdbEngine::reloadDebuggingHelpers()
......
......@@ -148,7 +148,7 @@ void LldbEngine::setupEngine()
SLOT(handleResponse(QByteArray)), Qt::QueuedConnection);
m_lldbProc.start(_("python"), QStringList() << _("-i")
<< (Core::ICore::resourcePath() + _("/dumper/lbridge.py")) << m_lldbCmd);
<< (Core::ICore::resourcePath() + _("/debugger/lldbbridge.py")) << m_lldbCmd);
if (!m_lldbProc.waitForStarted()) {
const QString msg = tr("Unable to start lldb '%1': %2")
......
......@@ -211,7 +211,7 @@ void PdbEngine::runEngine()
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
showStatusMessage(tr("Running requested..."), 5000);
const QByteArray dumperSourcePath =
Core::ICore::resourcePath().toLocal8Bit() + "/dumper/";
Core::ICore::resourcePath().toLocal8Bit() + "/debugger/";
QString fileName = QFileInfo(startParameters().executable).absoluteFilePath();
postDirectCommand("import sys");
postDirectCommand("sys.argv.append('" + fileName.toLocal8Bit() + "')");
......
......@@ -422,13 +422,13 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
<< QList<ProjectExplorer::Task>()
<< QString();
QTest::newRow("note")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR
<< QString() << QString()
<< ( QList<ProjectExplorer::Task>()
<< Task(Task::Unknown,
QLatin1String("initialized from here"),
Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/dumper/dumper.cpp")), 1079,
Utils::FileName::fromUserInput(QLatin1String("/home/dev/creator/share/qtcreator/debugger/dumper.cpp")), 1079,
categoryCompile))
<< QString();
QTest::newRow("static member function")
......
......@@ -338,9 +338,9 @@ void ProjectExplorerPlugin::testGnuMakeParserParsing_data()
<< QStringList();
QTest::newRow("pass-trough note")
<< QStringList()
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here")
<< QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here")
<< OutputParserTester::STDERR
<< QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp:1079: note: initialized from here\n")
<< QString() << QString::fromLatin1("/home/dev/creator/share/qtcreator/debugger/dumper.cpp:1079: note: initialized from here\n")
<< QList<ProjectExplorer::Task>()
<< QString()
<< QStringList();
......
......@@ -61,7 +61,7 @@ QStringList DebuggingHelperLibrary::debuggingHelperLibraryDirectories(const QStr
static QString sourcePath()
{
return Core::ICore::resourcePath() + QLatin1String("/dumper/");
return Core::ICore::resourcePath() + QLatin1String("/debugger/");
}
static QStringList sourceFileNames()
......
......@@ -5,7 +5,7 @@ QT += network
include(../qttest.pri)
DEBUGGERDIR = $$IDE_SOURCE_TREE/src/plugins/debugger
DUMPERDIR = $$IDE_SOURCE_TREE/share/qtcreator/dumper
DUMPERDIR = $$IDE_SOURCE_TREE/share/qtcreator/debugger
# To access the std::type rewriter
DEFINES += CPLUSPLUS_BUILD_STATIC_LIB
......
......@@ -27,7 +27,7 @@ Autotest {
cpp.defines: base.concat([
'CDBEXT_PATH="' + buildDirectory + '\\\\lib"',
'DUMPERDIR="' + path + '/../../../share/qtcreator/dumper"',
'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"',
'QT_NO_CAST_FROM_ASCII',
'QT_DISABLE_DEPRECATED_BEFORE=0x040900'
])
......
......@@ -837,7 +837,7 @@ void tst_Dumpers::dumper()
if (m_usePython) {
cmds += "python sys.path.insert(1, '" + dumperDir + "')\n"
"python from gbridge import *\n"
"python from gdbbridge import *\n"
"run " + nograb + "\n"
"up\n"
"python print('@%sS@%s@' % ('N', qtNamespace()))\n"
......@@ -879,7 +879,7 @@ void tst_Dumpers::dumper()
cmds += "q\n";
} else if (m_debuggerEngine == DumpTestLldbEngine) {
exe = "python";
args << QLatin1String(dumperDir + "/lbridge.py")
args << QLatin1String(dumperDir + "/lldbbridge.py")
<< QString::fromUtf8(m_debuggerBinary)
<< t->buildPath + QLatin1String("/doit")
<< QString::fromUtf8(expanded);
......@@ -4306,7 +4306,7 @@ void tst_Dumpers::dumper_data()
// // This tests qdump__KRBase in dumpers/qttypes.py which uses
// // This tests qdump__KRBase in share/qtcreator/debugger/qttypes.py which uses
// // a static typeflag to dispatch to subclasses");
// QTest::newRow("KR")
......
......@@ -3,5 +3,5 @@ TEMPLATE = app
greaterThan(QT_MAJOR_VERSION, 4):QT *= widgets
win32:DEFINES += _CRT_SECURE_NO_WARNINGS
SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/dumper/dumper.cpp
SOURCES += $$IDE_SOURCE_TREE/share/qtcreator/debugger/dumper.cpp
SOURCES += main.cpp
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