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

ios: improve kit and toolchains autodetection

Browse Source 
* simplify probe
* adapt to Xcode 5.0.1 (32->64 bits)
* force correct abi for iphonesimulator (autodetection fails)

Change-Id: Ib489d621858fd1b026222f067245a0480ea8fa03
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-10-31 17:46:52 +01:00
parent 66c7e8ca16
commit e461567500
3 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/ios/iosconfigurations.cpp
View File

@@ -108,8 +108,18 @@ void IosConfigurations::updateAutomaticKitList()
continue; continue;
if (p.compilerPath == toolchain->compilerCommand() if (p.compilerPath == toolchain->compilerCommand()
&& p.backendFlags == toolchain->platformCodeGenFlags()) { && p.backendFlags == toolchain->platformCodeGenFlags()) {
platformToolchainMap[p.name] = toolchain;
found = true; found = true;
if (p.architecture == QLatin1String("i386")
&& toolchain->targetAbi().wordWidth() != 32) {
if (debugProbe)
qDebug() << "resetting api of " << toolchain->displayName();
toolchain->setTargetAbi(Abi(Abi::X86Architecture,
Abi::MacOS, Abi::GenericMacFlavor,
Abi::MachOFormat, 32));
}
platformToolchainMap[p.name] = toolchain;
if (debugProbe)
qDebug() << p.name << " -> " << toolchain->displayName();
} }
} }
if (!found && (tc->displayName().startsWith(QLatin1String("iphone")) if (!found && (tc->displayName().startsWith(QLatin1String("iphone"))
@@ -153,6 +163,14 @@ void IosConfigurations::updateAutomaticKitList()
toolchain->setPlatformCodeGenFlags(p.backendFlags); toolchain->setPlatformCodeGenFlags(p.backendFlags);
toolchain->setPlatformLinkerFlags(p.backendFlags); toolchain->setPlatformLinkerFlags(p.backendFlags);
toolchain->setCompilerCommand(p.compilerPath); toolchain->setCompilerCommand(p.compilerPath);
if (p.architecture == QLatin1String("i386")) {
if (debugProbe)
qDebug() << "setting toolchain Abi for " << toolchain->displayName();
toolchain->setTargetAbi(Abi(Abi::X86Architecture,Abi::MacOS, Abi::GenericMacFlavor,
Abi::MachOFormat, 32));
}
if (debugProbe)
qDebug() << "adding toolchain " << p.name;
ToolChainManager::registerToolChain(toolchain); ToolChainManager::registerToolChain(toolchain);
platformToolchainMap.insert(p.name, toolchain); platformToolchainMap.insert(p.name, toolchain);
QMapIterator<QString, Platform> iter2(iter); QMapIterator<QString, Platform> iter2(iter);
@@ -178,6 +196,9 @@ void IosConfigurations::updateAutomaticKitList()
|| (p.platformKind & Platform::Cxx11Support) != 0 || (p.platformKind & Platform::Cxx11Support) != 0
|| !p.compilerPath.toString().contains(QLatin1String("clang"))) || !p.compilerPath.toString().contains(QLatin1String("clang")))
toRemove.append(p.name); toRemove.append(p.name);
else if (debugProbe)
qDebug() << "keeping" << p.name << " " << p.compilerPath.toString() << " "
<< p.backendFlags;
} }
foreach (const QString &pName, toRemove) { foreach (const QString &pName, toRemove) {
if (debugProbe) if (debugProbe)

82
src/plugins/ios/iosprobe.cpp
View File

@@ -111,37 +111,6 @@ void IosProbe::detectDeveloperPaths()
addDeveloperPath(QLatin1String("/Applications/Xcode.app/Contents/Developer")); addDeveloperPath(QLatin1String("/Applications/Xcode.app/Contents/Developer"));
} }
void IosProbe::setArch(Platform *platform, const QString &pathToGcc, const QStringList &extraFlags)
{
if (!extraFlags.isEmpty())
platform->backendFlags = extraFlags;
// setting architecture and endianness only here, bercause the same compiler
// can support several ones
QStringList flags(extraFlags);
flags << QLatin1String("-dumpmachine");
QString compilerTriplet = qsystem(pathToGcc, flags).simplified();
QStringList compilerTripletl = compilerTriplet.split(QLatin1Char('-'));
if (compilerTripletl.count() < 2) {
qDebug() << QString::fromLatin1("Detected '%1', but I don't understand "
"its architecture '%2'.")
.arg(pathToGcc, compilerTriplet);
return;
}
QString endianness, architecture;
architecture = compilerTripletl.at(0);
endianness = QLatin1String("little");
if (debugProbe)
qDebug() << QString::fromLatin1(" Toolchain %1 detected:\n"
" binary: %2\n"
" triplet: %3\n"
" arch: %4").arg(platform->name, pathToGcc,
compilerTriplet, architecture);
platform->architecture = architecture;
}
void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName) void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xcodeName)
{ {
if (debugProbe) if (debugProbe)
@@ -201,16 +170,15 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
bool hasGcc = gccFileInfo.exists(); bool hasGcc = gccFileInfo.exists();
QStringList extraFlags; QStringList extraFlags;
if (defaultProp.contains(QLatin1String("ARCHS"))) {
QString arch = defaultProp.value(QLatin1String("ARCHS")).toString();
if (arch == QLatin1String("$(NATIVE_ARCH_32_BIT)"))
extraFlags << QLatin1String("-arch") << QLatin1String("i386");
}
if (defaultProp.contains(QLatin1String("NATIVE_ARCH"))) { if (defaultProp.contains(QLatin1String("NATIVE_ARCH"))) {
QString arch = defaultProp.value(QLatin1String("NATIVE_ARCH")).toString(); QString arch = defaultProp.value(QLatin1String("NATIVE_ARCH")).toString();
if (!arch.startsWith(QLatin1String("arm"))) if (!arch.startsWith(QLatin1String("arm")))
qDebug() << indent << QString::fromLatin1("Expected arm architecture, not %1").arg(arch); qDebug() << indent << QString::fromLatin1("Expected arm architecture, not %1").arg(arch);
extraFlags << QLatin1String("-arch") << arch; extraFlags << QLatin1String("-arch") << arch;
} else if (name == QLatin1String("iphonesimulator")) {
QString arch = defaultProp.value(QLatin1String("ARCHS")).toString();
// don't generate a toolchain for 64 bit (to fix when we support that)
extraFlags << QLatin1String("-arch") << QLatin1String("i386");
} }
if (hasClang) { if (hasClang) {
Platform clangProfile; Platform clangProfile;
@@ -220,7 +188,13 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
clangProfile.platformPath = Utils::FileName(fInfo); clangProfile.platformPath = Utils::FileName(fInfo);
clangProfile.platformInfo = infoSettings; clangProfile.platformInfo = infoSettings;
clangProfile.compilerPath = Utils::FileName(clangFileInfo); clangProfile.compilerPath = Utils::FileName(clangFileInfo);
setArch(&clangProfile, clangFileInfo.canonicalFilePath(), extraFlags); QStringList flags = extraFlags;
flags << QLatin1String("-dumpmachine");
QString compilerTriplet = qsystem(clangFileInfo.canonicalFilePath(), flags)
.simplified();
QStringList compilerTripletl = compilerTriplet.split(QLatin1Char('-'));
clangProfile.architecture = compilerTripletl.value(0);
clangProfile.backendFlags = extraFlags;
if (debugProbe) if (debugProbe)
qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(clangProfile.name); qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(clangProfile.name);
m_platforms[clangProfile.name] = clangProfile; m_platforms[clangProfile.name] = clangProfile;
@@ -239,7 +213,13 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
gccProfile.platformPath = Utils::FileName(fInfo); gccProfile.platformPath = Utils::FileName(fInfo);
gccProfile.platformInfo = infoSettings; gccProfile.platformInfo = infoSettings;
gccProfile.compilerPath = Utils::FileName(gccFileInfo); gccProfile.compilerPath = Utils::FileName(gccFileInfo);
setArch(&gccProfile, gccFileInfo.canonicalFilePath(), extraFlags); QStringList flags = extraFlags;
flags << QLatin1String("-dumpmachine");
QString compilerTriplet = qsystem(gccFileInfo.canonicalFilePath(), flags)
.simplified();
QStringList compilerTripletl = compilerTriplet.split(QLatin1Char('-'));
gccProfile.architecture = compilerTripletl.value(0);
gccProfile.backendFlags = extraFlags;
if (debugProbe) if (debugProbe)
qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(gccProfile.name); qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(gccProfile.name);
m_platforms[gccProfile.name] = gccProfile; m_platforms[gccProfile.name] = gccProfile;
@@ -283,37 +263,12 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
sdkPath = sdkDirInfo.canonicalFilePath(); sdkPath = sdkDirInfo.canonicalFilePath();
sdkSettings = sdkInfo; sdkSettings = sdkInfo;
} }
if (hasClang){
Platform pSdk;
pSdk = m_platforms[clangFullName];
pSdk.name = safeName + QLatin1String("-clang") + xcodeName;
pSdk.sdkPath = Utils::FileName(sdkDirInfo);
pSdk.sdkSettings = sdkInfo;
if (debugProbe)
qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(pSdk.name);
m_platforms[pSdk.name] = pSdk;
pSdk.backendFlags.append(QLatin1String("-std=c++11"));
pSdk.backendFlags.append(QLatin1String("-stdlib=libc++"));
pSdk.name = safeName + QLatin1String("-clang11") + xcodeName;
m_platforms[pSdk.name] = pSdk;
}
if (hasGcc) {
Platform pSdk;
pSdk = m_platforms[gccFullName];
pSdk.name = safeName + QLatin1String("-gcc") + xcodeName;
pSdk.sdkPath = Utils::FileName(sdkDirInfo);
pSdk.sdkSettings = sdkInfo;
if (debugProbe)
qDebug() << indent << QString::fromLatin1("* adding profile %1").arg(pSdk.name);
m_platforms[pSdk.name] = pSdk;
}
} }
if (!sdkPath.isEmpty()) if (!sdkPath.isEmpty())
sysRoot = sdkPath; sysRoot = sdkPath;
else if (!sdkName.isEmpty()) else if (!sdkName.isEmpty())
qDebug() << indent << QString::fromLatin1("Failed to find sysroot %1").arg(sdkName); qDebug() << indent << QString::fromLatin1("Failed to find sysroot %1").arg(sdkName);
} }
//m_platforms.remove(clangFullName);
if (hasClang && !sysRoot.isEmpty()) { if (hasClang && !sysRoot.isEmpty()) {
m_platforms[clangFullName].platformKind |= Platform::BasePlatform; m_platforms[clangFullName].platformKind |= Platform::BasePlatform;
m_platforms[clangFullName].sdkPath = Utils::FileName::fromString(sysRoot); m_platforms[clangFullName].sdkPath = Utils::FileName::fromString(sysRoot);
@@ -322,7 +277,6 @@ void IosProbe::setupDefaultToolchains(const QString &devPath, const QString &xco
m_platforms[clang11FullName].sdkPath = Utils::FileName::fromString(sysRoot); m_platforms[clang11FullName].sdkPath = Utils::FileName::fromString(sysRoot);
m_platforms[clang11FullName].sdkSettings = sdkSettings; m_platforms[clang11FullName].sdkSettings = sdkSettings;
} }
//m_platforms.remove(gccFullName);
if (hasGcc && !sysRoot.isEmpty()) { if (hasGcc && !sysRoot.isEmpty()) {
m_platforms[gccFullName].platformKind |= Platform::BasePlatform; m_platforms[gccFullName].platformKind |= Platform::BasePlatform;
m_platforms[gccFullName].sdkPath = Utils::FileName::fromString(sysRoot); m_platforms[gccFullName].sdkPath = Utils::FileName::fromString(sysRoot);

1
src/plugins/ios/iosprobe.h
View File

@@ -69,7 +69,6 @@ public:
private: private:
void addDeveloperPath(const QString &path); void addDeveloperPath(const QString &path);
void detectDeveloperPaths(); void detectDeveloperPaths();
void setArch(Platform *platform, const QString &pathToGcc, const QStringList &extraFlags);
void setupDefaultToolchains(const QString &devPath, const QString &xcodeName); void setupDefaultToolchains(const QString &devPath, const QString &xcodeName);
void detectFirst(); void detectFirst();
QMap<QString, Platform> detectedPlatforms(); QMap<QString, Platform> detectedPlatforms();