feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Rename remaining ToolChain things to Toolchain

Browse Source 
Change-Id: Icd90402501b3ca2197e124731e26d2f9b0704e0a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-01-22 17:37:12 +01:00
parent 8ef85e481a
commit d7c1fe129f
15 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/plugins/mcusupport/mcupackage.cpp
View File

@@ -352,12 +352,12 @@ const QMap<QString, QString> McuPackage::packageLabelTranslations {
{"Path to project for Renesas e2 Studio", Tr::tr("Path to project for Renesas e2 Studio")}
};
McuToolChainPackage::McuToolChainPackage(const SettingsHandler::Ptr &settingsHandler,
McuToolchainPackage::McuToolchainPackage(const SettingsHandler::Ptr &settingsHandler,
const QString &label,
const FilePath &defaultPath,
const QList<FilePath> &detectionPaths,
const Key &settingsKey,
McuToolChainPackage::ToolChainType type,
McuToolchainPackage::ToolchainType type,
const QStringList &versions,
const QString &cmakeVarName,
const QString &envVarName,
@@ -375,18 +375,18 @@ McuToolChainPackage::McuToolChainPackage(const SettingsHandler::Ptr &settingsHan
, m_type(type)
{}
McuToolChainPackage::ToolChainType McuToolChainPackage::toolchainType() const
McuToolchainPackage::ToolchainType McuToolchainPackage::toolchainType() const
{
return m_type;
}
bool McuToolChainPackage::isDesktopToolchain() const
bool McuToolchainPackage::isDesktopToolchain() const
{
return m_type == ToolChainType::MSVC || m_type == ToolChainType::GCC
|| m_type == ToolChainType::MinGW;
return m_type == ToolchainType::MSVC || m_type == ToolchainType::GCC
|| m_type == ToolchainType::MinGW;
}
Toolchain *McuToolChainPackage::msvcToolChain(Id language)
Toolchain *McuToolchainPackage::msvcToolchain(Id language)
{
Toolchain *toolChain = ToolchainManager::toolchain([language](const Toolchain *t) {
const Abi abi = t->targetAbi();
@@ -398,7 +398,7 @@ Toolchain *McuToolChainPackage::msvcToolChain(Id language)
return toolChain;
}
Toolchain *McuToolChainPackage::gccToolChain(Id language)
Toolchain *McuToolchainPackage::gccToolchain(Id language)
{
Toolchain *toolChain = ToolchainManager::toolchain([language](const Toolchain *t) {
const Abi abi = t->targetAbi();
@@ -408,7 +408,7 @@ Toolchain *McuToolChainPackage::gccToolChain(Id language)
return toolChain;
}
static Toolchain *mingwToolChain(const FilePath &path, Id language)
static Toolchain *mingwToolchain(const FilePath &path, Id language)
{
Toolchain *toolChain = ToolchainManager::toolchain([&path, language](const Toolchain *t) {
// find a MinGW toolchain having the same path from registered toolchains
@@ -430,7 +430,7 @@ static Toolchain *mingwToolChain(const FilePath &path, Id language)
return toolChain;
}
static Toolchain *armGccToolChain(const FilePath &path, Id language)
static Toolchain *armGccToolchain(const FilePath &path, Id language)
{
Toolchain *toolChain = ToolchainManager::toolchain([&path, language](const Toolchain *t) {
return t->compilerCommand() == path && t->language() == language;
@@ -456,7 +456,7 @@ static Toolchain *armGccToolChain(const FilePath &path, Id language)
return toolChain;
}
static Toolchain *iarToolChain(const FilePath &path, Id language)
static Toolchain *iarToolchain(const FilePath &path, Id language)
{
Toolchain *toolChain = ToolchainManager::toolchain([language](const Toolchain *t) {
return t->typeId() == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID
@@ -488,67 +488,67 @@ static Toolchain *iarToolChain(const FilePath &path, Id language)
return toolChain;
}
Toolchain *McuToolChainPackage::toolChain(Id language) const
Toolchain *McuToolchainPackage::toolChain(Id language) const
{
switch (m_type) {
case ToolChainType::MSVC:
return msvcToolChain(language);
case ToolChainType::GCC:
return gccToolChain(language);
case ToolChainType::MinGW: {
case ToolchainType::MSVC:
return msvcToolchain(language);
case ToolchainType::GCC:
return gccToolchain(language);
case ToolchainType::MinGW: {
const QLatin1String compilerName(
language == ProjectExplorer::Constants::C_LANGUAGE_ID ? "gcc" : "g++");
const FilePath compilerPath = (path() / "bin" / compilerName).withExecutableSuffix();
return mingwToolChain(compilerPath, language);
return mingwToolchain(compilerPath, language);
}
case ToolChainType::IAR: {
case ToolchainType::IAR: {
const FilePath compiler = (path() / "/bin/iccarm").withExecutableSuffix();
return iarToolChain(compiler, language);
return iarToolchain(compiler, language);
}
case ToolChainType::ArmGcc:
case ToolChainType::KEIL:
case ToolChainType::GHS:
case ToolChainType::GHSArm:
case ToolChainType::Unsupported: {
case ToolchainType::ArmGcc:
case ToolchainType::KEIL:
case ToolchainType::GHS:
case ToolchainType::GHSArm:
case ToolchainType::Unsupported: {
const QLatin1String compilerName(
language == ProjectExplorer::Constants::C_LANGUAGE_ID ? "gcc" : "g++");
const QString comp = QLatin1String(m_type == ToolChainType::ArmGcc ? "/bin/arm-none-eabi-%1"
const QString comp = QLatin1String(m_type == ToolchainType::ArmGcc ? "/bin/arm-none-eabi-%1"
: "/bar/foo-keil-%1")
.arg(compilerName);
const FilePath compiler = (path() / comp).withExecutableSuffix();
return armGccToolChain(compiler, language);
return armGccToolchain(compiler, language);
}
default:
Q_UNREACHABLE();
}
}
QString McuToolChainPackage::toolChainName() const
QString McuToolchainPackage::toolchainName() const
{
switch (m_type) {
case ToolChainType::MSVC:
case ToolchainType::MSVC:
return QLatin1String("msvc");
case ToolChainType::GCC:
case ToolchainType::GCC:
return QLatin1String("gcc");
case ToolChainType::MinGW:
case ToolchainType::MinGW:
return QLatin1String("mingw");
case ToolChainType::ArmGcc:
case ToolchainType::ArmGcc:
return QLatin1String("armgcc");
case ToolChainType::IAR:
case ToolchainType::IAR:
return QLatin1String("iar");
case ToolChainType::KEIL:
case ToolchainType::KEIL:
return QLatin1String("keil");
case ToolChainType::GHS:
case ToolchainType::GHS:
return QLatin1String("ghs");
case ToolChainType::GHSArm:
case ToolchainType::GHSArm:
return QLatin1String("ghs-arm");
default:
return QLatin1String("unsupported");
}
}
QVariant McuToolChainPackage::debuggerId() const
QVariant McuToolchainPackage::debuggerId() const
{
using namespace Debugger;
@@ -556,19 +556,19 @@ QVariant McuToolChainPackage::debuggerId() const
DebuggerEngineType engineType;
switch (m_type) {
case ToolChainType::ArmGcc: {
case ToolchainType::ArmGcc: {
sub = QString::fromLatin1("bin/arm-none-eabi-gdb-py");
displayName = Tr::tr("Arm GDB at %1");
engineType = Debugger::GdbEngineType;
break;
}
case ToolChainType::IAR: {
case ToolchainType::IAR: {
sub = QString::fromLatin1("../common/bin/CSpyBat");
displayName = QLatin1String("CSpy");
engineType = Debugger::NoEngineType; // support for IAR missing
break;
}
case ToolChainType::KEIL: {
case ToolchainType::KEIL: {
sub = QString::fromLatin1("UV4/UV4");
displayName = QLatin1String("KEIL uVision Debugger");
engineType = Debugger::UvscEngineType;