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

iOS: Find Xcode version

Browse Source 
To enable/disable the version specific features

Change-Id: Ia4cbe83f0aae366f517d8b46f322d8202dbbe3c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Vikas Pachdha
2016-12-21 10:13:38 +01:00
parent ffabc5dff1
commit 1e8c0c3632
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/synchronousprocess.h>
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
@@ -48,6 +49,7 @@
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <qtsupport/qtversionfactory.h> #include <qtsupport/qtversionfactory.h>
#include <QDomDocument>
#include <QFileInfo> #include <QFileInfo>
#include <QHash> #include <QHash>
#include <QList> #include <QList>
@@ -62,6 +64,7 @@ using namespace Debugger;
namespace { namespace {
Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup") Q_LOGGING_CATEGORY(kitSetupLog, "qtc.ios.kitSetup")
Q_LOGGING_CATEGORY(iosCommonLog, "qtc.ios.common")
} }
using ToolChainPair = std::pair<ClangToolChain *, ClangToolChain *>; using ToolChainPair = std::pair<ClangToolChain *, ClangToolChain *>;
@@ -207,6 +210,33 @@ static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolCh
SysRootKitInformation::setSysRoot(kit, sdkPath); SysRootKitInformation::setSysRoot(kit, sdkPath);
} }
static QVersionNumber findXcodeVersion()
{
Utils::SynchronousProcess pkgUtilProcess;
Utils::SynchronousProcessResponse resp =
pkgUtilProcess.runBlocking("pkgutil", QStringList("--pkg-info-plist=com.apple.pkg.Xcode"));
if (resp.result == Utils::SynchronousProcessResponse::Finished) {
QDomDocument xcodeVersionDoc;
if (xcodeVersionDoc.setContent(resp.allRawOutput())) {
QDomNodeList nodes = xcodeVersionDoc.elementsByTagName(QStringLiteral("key"));
for (int i = 0; i < nodes.count(); ++i) {
QDomElement elem = nodes.at(i).toElement();
if (elem.text().compare(QStringLiteral("pkg-version")) == 0) {
QString versionStr = elem.nextSiblingElement().text();
return QVersionNumber::fromString(versionStr);
}
}
} else {
qCDebug(iosCommonLog) << "Error finding Xcode version. Cannot parse xml output from pkgutil.";
}
} else {
qCDebug(iosCommonLog) << "Error finding Xcode version. pkgutil command failed.";
}
qCDebug(iosCommonLog) << "Error finding Xcode version. Unknow error.";
return QVersionNumber();
}
void IosConfigurations::updateAutomaticKitList() void IosConfigurations::updateAutomaticKitList()
{ {
const QList<Platform> platforms = handledPlatforms(); const QList<Platform> platforms = handledPlatforms();
@@ -312,6 +342,11 @@ FileName IosConfigurations::developerPath()
return m_instance->m_developerPath; return m_instance->m_developerPath;
} }
QVersionNumber IosConfigurations::xcodeVersion()
{
return m_instance->m_xcodeVersion;
}
void IosConfigurations::save() void IosConfigurations::save()
{ {
QSettings *settings = Core::ICore::settings(); QSettings *settings = Core::ICore::settings();
@@ -358,6 +393,9 @@ void IosConfigurations::setDeveloperPath(const FileName &devPath)
QTimer::singleShot(1000, IosDeviceManager::instance(), QTimer::singleShot(1000, IosDeviceManager::instance(),
&IosDeviceManager::monitorAvailableDevices); &IosDeviceManager::monitorAvailableDevices);
m_instance->updateSimulators(); m_instance->updateSimulators();
// Find xcode version.
m_instance->m_xcodeVersion = findXcodeVersion();
} }
} }
} }

3
src/plugins/ios/iosconfigurations.h
View File

@@ -32,6 +32,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QVersionNumber>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QSettings; class QSettings;
@@ -60,6 +61,7 @@ public:
static bool ignoreAllDevices(); static bool ignoreAllDevices();
static void setIgnoreAllDevices(bool ignoreDevices); static void setIgnoreAllDevices(bool ignoreDevices);
static Utils::FileName developerPath(); static Utils::FileName developerPath();
static QVersionNumber xcodeVersion();
static Utils::FileName lldbPath(); static Utils::FileName lldbPath();
static void updateAutomaticKitList(); static void updateAutomaticKitList();
@@ -71,6 +73,7 @@ private:
static void setDeveloperPath(const Utils::FileName &devPath); static void setDeveloperPath(const Utils::FileName &devPath);
Utils::FileName m_developerPath; Utils::FileName m_developerPath;
QVersionNumber m_xcodeVersion;
bool m_ignoreAllDevices; bool m_ignoreAllDevices;
}; };