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

QbsProjectManager: Make DefaultPropertyProvider a bit more readable.

Browse Source 
- Decrease indentation by exiting early.
- Use switch instead of "else if".

Change-Id: I74e73e087f64c16f01497854c67f581ef79aff3c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-08-20 14:11:46 +02:00
parent 869445b76d
commit 49ae97662d
1 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

199
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -67,112 +67,119 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
data.insert(QLatin1String(QBS_SYSROOT), sysroot); data.insert(QLatin1String(QBS_SYSROOT), sysroot);
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k); ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
if (tc) { if (!tc)
// FIXME/CLARIFY: How to pass the sysroot? return data;
ProjectExplorer::Abi targetAbi = tc->targetAbi();
if (targetAbi.architecture() != ProjectExplorer::Abi::UnknownArchitecture) {
QString architecture = ProjectExplorer::Abi::toString(targetAbi.architecture());
// We have to be conservative tacking on suffixes to arch names because an arch that is // FIXME/CLARIFY: How to pass the sysroot?
// already 64-bit may get an incorrect name as a result (i.e. Itanium) ProjectExplorer::Abi targetAbi = tc->targetAbi();
if (targetAbi.wordWidth() == 64) { if (targetAbi.architecture() != ProjectExplorer::Abi::UnknownArchitecture) {
switch (targetAbi.architecture()) { QString architecture = ProjectExplorer::Abi::toString(targetAbi.architecture());
case ProjectExplorer::Abi::X86Architecture:
architecture.append(QLatin1String("_")); // We have to be conservative tacking on suffixes to arch names because an arch that is
// fall through // already 64-bit may get an incorrect name as a result (i.e. Itanium)
case ProjectExplorer::Abi::ArmArchitecture: if (targetAbi.wordWidth() == 64) {
case ProjectExplorer::Abi::MipsArchitecture: switch (targetAbi.architecture()) {
case ProjectExplorer::Abi::PowerPCArchitecture: case ProjectExplorer::Abi::X86Architecture:
architecture.append(QString::number(targetAbi.wordWidth())); architecture.append(QLatin1String("_"));
break; // fall through
default: case ProjectExplorer::Abi::ArmArchitecture:
break; case ProjectExplorer::Abi::MipsArchitecture:
} case ProjectExplorer::Abi::PowerPCArchitecture:
architecture.append(QString::number(targetAbi.wordWidth()));
break;
default:
break;
} }
data.insert(QLatin1String(QBS_ARCHITECTURE),
qbs::Internal::HostOsInfo::canonicalArchitecture(architecture));
} }
if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) { data.insert(QLatin1String(QBS_ARCHITECTURE),
data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("windows")); qbs::Internal::HostOsInfo::canonicalArchitecture(architecture));
data.insert(QLatin1String(QBS_TOOLCHAIN), }
targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor
? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
: QStringList() << QLatin1String("msvc"));
} else if (targetAbi.os() == ProjectExplorer::Abi::MacOS) {
const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
const char IOS_SIMULATOR_TYPE[] = "Ios.Simulator.Type";
const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k); switch (targetAbi.os()) {
QStringList targetOS; case ProjectExplorer::Abi::WindowsOS:
targetOS << QLatin1String("darwin") << QLatin1String("bsd4") data.insert(QLatin1String(QBS_TARGETOS), QLatin1String("windows"));
<< QLatin1String("bsd") << QLatin1String("unix"); data.insert(QLatin1String(QBS_TOOLCHAIN),
if (qt && qt->type() == QLatin1String(IOSQT)) { targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor
targetOS.insert(0, QLatin1String("ios")); ? QStringList() << QLatin1String("mingw") << QLatin1String("gcc")
if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k) == IOS_SIMULATOR_TYPE) : QStringList() << QLatin1String("msvc"));
targetOS.insert(0, QLatin1String("ios-simulator")); break;
} else { case ProjectExplorer::Abi::MacOS: {
targetOS.insert(0, QLatin1String("osx")); const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; // from Ios::Constants (include header?)
} const char IOS_SIMULATOR_TYPE[] = "Ios.Simulator.Type";
data.insert(QLatin1String(QBS_TARGETOS), targetOS);
if (tc->type() != QLatin1String("clang")) { const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k);
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc")); QStringList targetOS;
} else { targetOS << QLatin1String("darwin") << QLatin1String("bsd4")
data.insert(QLatin1String(QBS_TOOLCHAIN), << QLatin1String("bsd") << QLatin1String("unix");
QStringList() << QLatin1String("clang") if (qt && qt->type() == QLatin1String(IOSQT)) {
<< QLatin1String("llvm") targetOS.insert(0, QLatin1String("ios"));
<< QLatin1String("gcc")); if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k) == IOS_SIMULATOR_TYPE)
} targetOS.insert(0, QLatin1String("ios-simulator"));
// Set Xcode SDK name and version - required by Qbs if a sysroot is present
// Ideally this would be done in a better way...
QRegExp re(QLatin1String("(MacOSX|iPhoneOS|iPhoneSimulator)([0-9]+\\.[0-9]+)\\.sdk"));
if (re.exactMatch(QDir(sysroot).dirName())) {
data.insert(QLatin1String(CPP_XCODESDKNAME), QString(re.cap(1).toLower() + re.cap(2)));
data.insert(QLatin1String(CPP_XCODESDKVERSION), re.cap(2));
}
} else if (targetAbi.os() == ProjectExplorer::Abi::LinuxOS) {
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("linux")
<< QLatin1String("unix"));
if (tc->type() != QLatin1String("clang")) {
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
} else {
data.insert(QLatin1String(QBS_TOOLCHAIN),
QStringList() << QLatin1String("clang")
<< QLatin1String("llvm")
<< QLatin1String("gcc"));
}
} else { } else {
// TODO: Factor out toolchain type setting. targetOS.insert(0, QLatin1String("osx"));
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("unix"));
if (tc->type() != QLatin1String("clang")) {
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
} else {
data.insert(QLatin1String(QBS_TOOLCHAIN),
QStringList() << QLatin1String("clang")
<< QLatin1String("llvm")
<< QLatin1String("gcc"));
}
} }
Utils::FileName cxx = tc->compilerCommand(); data.insert(QLatin1String(QBS_TARGETOS), targetOS);
const QFileInfo cxxFileInfo = cxx.toFileInfo();
QString compilerName = cxxFileInfo.fileName(); if (tc->type() != QLatin1String("clang")) {
const QString toolchainPrefix = extractToolchainPrefix(&compilerName); data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
if (!toolchainPrefix.isEmpty()) } else {
data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix); data.insert(QLatin1String(QBS_TOOLCHAIN),
data.insert(QLatin1String(CPP_COMPILERNAME), compilerName); QStringList() << QLatin1String("clang")
if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS << QLatin1String("llvm")
|| targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) { << QLatin1String("gcc"));
data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
} }
data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) { // Set Xcode SDK name and version - required by Qbs if a sysroot is present
const QLatin1String flags("/FS"); // Ideally this would be done in a better way...
data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags); QRegExp re(QLatin1String("(MacOSX|iPhoneOS|iPhoneSimulator)([0-9]+\\.[0-9]+)\\.sdk"));
data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags); if (re.exactMatch(QDir(sysroot).dirName())) {
data.insert(QLatin1String(CPP_XCODESDKNAME), QString(re.cap(1).toLower() + re.cap(2)));
data.insert(QLatin1String(CPP_XCODESDKVERSION), re.cap(2));
} }
break;
}
case ProjectExplorer::Abi::LinuxOS:
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("linux")
<< QLatin1String("unix"));
if (tc->type() != QLatin1String("clang")) {
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
} else {
data.insert(QLatin1String(QBS_TOOLCHAIN),
QStringList() << QLatin1String("clang")
<< QLatin1String("llvm")
<< QLatin1String("gcc"));
}
break;
default:
// TODO: Factor out toolchain type setting.
data.insert(QLatin1String(QBS_TARGETOS), QStringList() << QLatin1String("unix"));
if (tc->type() != QLatin1String("clang")) {
data.insert(QLatin1String(QBS_TOOLCHAIN), QLatin1String("gcc"));
} else {
data.insert(QLatin1String(QBS_TOOLCHAIN),
QStringList() << QLatin1String("clang")
<< QLatin1String("llvm")
<< QLatin1String("gcc"));
}
}
Utils::FileName cxx = tc->compilerCommand();
const QFileInfo cxxFileInfo = cxx.toFileInfo();
QString compilerName = cxxFileInfo.fileName();
const QString toolchainPrefix = extractToolchainPrefix(&compilerName);
if (!toolchainPrefix.isEmpty())
data.insert(QLatin1String(CPP_TOOLCHAINPREFIX), toolchainPrefix);
data.insert(QLatin1String(CPP_COMPILERNAME), compilerName);
if (targetAbi.os() != ProjectExplorer::Abi::WindowsOS
|| targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor) {
data.insert(QLatin1String(CPP_LINKERNAME), compilerName);
}
data.insert(QLatin1String(CPP_TOOLCHAINPATH), cxxFileInfo.absolutePath());
if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvc2013Flavor) {
const QLatin1String flags("/FS");
data.insert(QLatin1String(CPP_PLATFORMCFLAGS), flags);
data.insert(QLatin1String(CPP_PLATFORMCXXFLAGS), flags);
} }
return data; return data;
} }