From 39462767f9c8c97d377cea34c83a15872901de88 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 16 May 2019 17:35:34 +0300 Subject: bare-metal: Improve the IAR toolchain auto detection Now the IAR compiler path also extracts from the Windows registry in addition to the path feature. Change-Id: I77d2cc13924afac751445df98ea60f1f62f9d892 Reviewed-by: Christian Kandeler --- src/app/qbs-setup-toolchains/iarewprobe.cpp | 200 +++++++++++++++++++++ src/app/qbs-setup-toolchains/iarewprobe.h | 65 +++++++ src/app/qbs-setup-toolchains/probe.cpp | 65 +------ .../qbs-setup-toolchains/qbs-setup-toolchains.pro | 2 + .../qbs-setup-toolchains/qbs-setup-toolchains.qbs | 2 + 5 files changed, 270 insertions(+), 64 deletions(-) create mode 100644 src/app/qbs-setup-toolchains/iarewprobe.cpp create mode 100644 src/app/qbs-setup-toolchains/iarewprobe.h diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp new file mode 100644 index 000000000..fe3cf4082 --- /dev/null +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -0,0 +1,200 @@ +/**************************************************************************** +** +** Copyright (C) 2019 Denis Shienkov +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qbs. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "probe.h" +#include "iarewprobe.h" + +#include "../shared/logging/consolelogger.h" + +#include + +#include +#include + +#include +#include +#include + +using namespace qbs; +using Internal::Tr; +using Internal::HostOsInfo; + +namespace { + +static QStringList knownIarCompilerNames() +{ + return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr")}; +} + +static QString guessIarArchitecture(const QFileInfo &compiler) +{ + const auto baseName = compiler.baseName(); + if (baseName == QLatin1String("icc8051")) + return QStringLiteral("mcs51"); + if (baseName == QLatin1String("iccarm")) + return QStringLiteral("arm"); + if (baseName == QLatin1String("iccavr")) + return QStringLiteral("avr"); + return {}; +} + +static Profile createIarProfileHelper(const QFileInfo &compiler, Settings *settings, + QString profileName = QString()) +{ + const QString architecture = guessIarArchitecture(compiler); + + // In case the profile is auto-detected. + if (profileName.isEmpty()) + profileName = QLatin1String("iar-") + architecture; + + Profile profile(profileName, settings); + profile.setValue(QLatin1String("cpp.toolchainInstallPath"), compiler.absolutePath()); + profile.setValue(QLatin1String("qbs.toolchainType"), QLatin1String("iar")); + if (!architecture.isEmpty()) + profile.setValue(QLatin1String("qbs.architecture"), architecture); + + qbsInfo() << Tr::tr("Profile '%1' created for '%2'.").arg( + profile.name(), compiler.absoluteFilePath()); + return profile; +} + +static std::vector installedIarsFromPath() +{ + std::vector infos; + const auto compilerNames = knownIarCompilerNames(); + for (const QString &compilerName : compilerNames) { + const QFileInfo iarPath( + findExecutable( + HostOsInfo::appendExecutableSuffix(compilerName))); + if (!iarPath.exists()) + continue; + infos.push_back({iarPath.absoluteFilePath(), {}}); + } + return infos; +} + +static std::vector installedIarsFromRegistry() +{ + std::vector infos; + + if (HostOsInfo::isWindowsHost()) { + +#ifdef Q_OS_WIN64 + static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\IAR Systems\\Embedded Workbench"; +#else + static const char kRegistryNode[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\IAR Systems\\Embedded Workbench"; +#endif + + // Dictionary for know toolchains. + static const struct Entry { + QString registryKey; + QString subExePath; + } knowToolchains[] = { + {QStringLiteral("EWARM"), QStringLiteral("\\arm\\bin\\iccarm.exe")}, + {QStringLiteral("EWAVR"), QStringLiteral("\\avr\\bin\\iccavr.exe")}, + {QStringLiteral("EW8051"), QStringLiteral("\\8051\\bin\\icc8051.exe")}, + }; + + QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); + const auto oneLevelGroups = registry.childGroups(); + for (const QString &oneLevelKey : oneLevelGroups) { + registry.beginGroup(oneLevelKey); + const auto twoLevelGroups = registry.childGroups(); + for (const Entry &entry : knowToolchains) { + if (twoLevelGroups.contains(entry.registryKey)) { + registry.beginGroup(entry.registryKey); + const auto threeLevelGroups = registry.childGroups(); + for (const QString &threeLevelKey : threeLevelGroups) { + registry.beginGroup(threeLevelKey); + const QString rootPath = registry.value( + QStringLiteral("InstallPath")).toString(); + if (!rootPath.isEmpty()) { + // Build full compiler path. + const QFileInfo iarPath(rootPath + entry.subExePath); + if (iarPath.exists()) { + // Note: threeLevelKey is a guessed toolchain version. + const QString version = threeLevelKey; + infos.push_back({iarPath.absoluteFilePath(), version}); + } + } + registry.endGroup(); + } + registry.endGroup(); + } + } + registry.endGroup(); + } + + } + + return infos; +} + +} // end of anonymous namespace + +bool isIarCompiler(const QString &compilerName) +{ + return Internal::any_of(knownIarCompilerNames(), [compilerName]( + const QString &knownName) { + return compilerName.contains(knownName); + }); +} + +void createIarProfile(const QFileInfo &compiler, Settings *settings, + QString profileName) +{ + createIarProfileHelper(compiler, settings, profileName); +} + +void iarProbe(Settings *settings, QList &profiles) +{ + qbsInfo() << Tr::tr("Trying to detect IAR toolchains..."); + + std::vector allInfos = installedIarsFromRegistry(); + const std::vector pathInfos = installedIarsFromPath(); + allInfos.insert(std::end(allInfos), std::begin(pathInfos), std::end(pathInfos)); + + for (const IarInstallInfo &info : allInfos) { + const auto profile = createIarProfileHelper(info.compilerPath, settings); + profiles.push_back(profile); + } + + if (allInfos.empty()) + qbsInfo() << Tr::tr("No IAR toolchains found."); +} diff --git a/src/app/qbs-setup-toolchains/iarewprobe.h b/src/app/qbs-setup-toolchains/iarewprobe.h new file mode 100644 index 000000000..b549eddb8 --- /dev/null +++ b/src/app/qbs-setup-toolchains/iarewprobe.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2019 Denis Shienkov +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qbs. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef IAREWPROBE_H +#define IAREWPROBE_H + +#include + +class QFileInfo; + +namespace qbs { +class Profile; +class Settings; +} + +struct IarInstallInfo +{ + QString compilerPath; + QString version; +}; + +bool isIarCompiler(const QString &compilerName); + +void createIarProfile(const QFileInfo &compiler, qbs::Settings *settings, + QString profileName); + +void iarProbe(qbs::Settings *settings, QList &profiles); + +#endif // IAREWPROBE_H diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp index df617da23..625eeddd9 100644 --- a/src/app/qbs-setup-toolchains/probe.cpp +++ b/src/app/qbs-setup-toolchains/probe.cpp @@ -39,6 +39,7 @@ #include "probe.h" #include "clangclprobe.h" +#include "iarewprobe.h" #include "msvcprobe.h" #include "sdccprobe.h" #include "xcodeprobe.h" @@ -109,18 +110,6 @@ static QStringList validMinGWMachines() QStringLiteral("i586-mingw32msvc"), QStringLiteral("amd64-mingw32msvc")}; } -static QStringList knownIarCompilerNames() -{ - return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr")}; -} - -static bool isIarCompiler(const QString &compilerName) -{ - return Internal::any_of(knownIarCompilerNames(), [compilerName](const QString &knownName) { - return compilerName.contains(knownName); - }); -} - static QStringList knownKeilCompilerNames() { return {QStringLiteral("c51"), QStringLiteral("armcc")}; @@ -270,39 +259,6 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti return profile; } -static QString guessIarArchitecture(const QFileInfo &compiler) -{ - const auto baseName = compiler.baseName(); - if (baseName == QLatin1String("icc8051")) - return QStringLiteral("mcs51"); - if (baseName == QLatin1String("iccarm")) - return QStringLiteral("arm"); - if (baseName == QLatin1String("iccavr")) - return QStringLiteral("avr"); - return {}; -} - -static Profile createIarProfile(const QFileInfo &compiler, Settings *settings, - QString profileName = QString()) -{ - const QString architecture = guessIarArchitecture(compiler); - - // In case the profile is auto-detected. - if (profileName.isEmpty()) - profileName = QLatin1String("iar-") + architecture; - - Profile profile(profileName, settings); - profile.setValue(QLatin1String("cpp.toolchainInstallPath"), compiler.absolutePath()); - profile.setValue(QLatin1String("qbs.toolchainType"), QLatin1String("iar")); - if (!architecture.isEmpty()) - profile.setValue(QLatin1String("qbs.architecture"), architecture); - - qStdout << Tr::tr("Profile '%1' created for '%2'.").arg( - profile.name(), compiler.absoluteFilePath()) - << endl; - return profile; -} - static QString guessKeilArchitecture(const QFileInfo &compiler) { const auto baseName = compiler.baseName(); @@ -372,25 +328,6 @@ static void mingwProbe(Settings *settings, QList &profiles) } } -static void iarProbe(Settings *settings, QList &profiles) -{ - qStdout << Tr::tr("Trying to detect IAR toolchains...") << endl; - - bool isFound = false; - const auto compilerNames = knownIarCompilerNames(); - for (const QString &compilerName : compilerNames) { - const QString iarPath = findExecutable(HostOsInfo::appendExecutableSuffix(compilerName)); - if (!iarPath.isEmpty()) { - const auto profile = createIarProfile(iarPath, settings); - profiles.push_back(profile); - isFound = true; - } - } - - if (!isFound) - qStdout << Tr::tr("No IAR toolchains found.") << endl; -} - static void keilProbe(Settings *settings, QList &profiles) { qStdout << Tr::tr("Trying to detect KEIL toolchains...") << endl; diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro index 8cb1f2d70..a341f6469 100644 --- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro +++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro @@ -5,6 +5,7 @@ TARGET = qbs-setup-toolchains HEADERS += \ clangclprobe.h \ commandlineparser.h \ + iarewprobe.h \ msvcprobe.h \ probe.h \ sdccprobe.h \ @@ -13,6 +14,7 @@ HEADERS += \ SOURCES += \ clangclprobe.cpp \ commandlineparser.cpp \ + iarewprobe.cpp \ main.cpp \ msvcprobe.cpp \ probe.cpp \ diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs index 6c772e8f6..49e4c87e9 100644 --- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs +++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs @@ -8,6 +8,8 @@ QbsApp { "clangclprobe.h", "commandlineparser.cpp", "commandlineparser.h", + "iarewprobe.cpp", + "iarewprobe.h", "main.cpp", "msvcprobe.cpp", "msvcprobe.h", -- cgit v1.2.3