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

Docker: detect python in docker images

Browse Source 
Change-Id: I841cdb7ce1cb8f34565a5e6993c5c825937e3eab
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2022-08-26 15:16:08 +02:00
parent 407082bcb2
commit a634833720
5 changed files with 159 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/docker/kitdetector.cpp
View File

@@ -47,6 +47,7 @@ public:
private:
QtVersions autoDetectQtVersions() const;
QList<ToolChain *> autoDetectToolChains();
void autoDetectPython();
QList<Id> autoDetectCMake();
void autoDetectDebugger();
@@ -133,6 +134,16 @@ void KitDetectorPrivate::undoAutoDetect() const
emit q->logOutput('\n' + logMessage);
}
if (auto pythonSettings = ExtensionSystem::PluginManager::getObjectByName("PythonSettings")) {
QString logMessage;
const bool res = QMetaObject::invokeMethod(pythonSettings,
"removeDetectedPython",
Q_ARG(QString, m_sharedId),
Q_ARG(QString *, &logMessage));
QTC_CHECK(res);
emit q->logOutput('\n' + logMessage);
}
emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Removal of previously auto-detected kit items finished.") + "\n\n");
}
@@ -180,6 +191,16 @@ void KitDetectorPrivate::listAutoDetected() const
emit q->logOutput('\n' + logMessage);
}
if (auto pythonSettings = ExtensionSystem::PluginManager::getObjectByName("PythonSettings")) {
QString logMessage;
const bool res = QMetaObject::invokeMethod(pythonSettings,
"listDetectedPython",
Q_ARG(QString, m_sharedId),
Q_ARG(QString *, &logMessage));
QTC_CHECK(res);
emit q->logOutput('\n' + logMessage);
}
emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Listing of previously auto-detected kit items finished.") + "\n\n");
}
@@ -252,6 +273,23 @@ Toolchains KitDetectorPrivate::autoDetectToolChains()
return allNewToolChains;
}
void KitDetectorPrivate::autoDetectPython()
{
QObject *pythonSettings = ExtensionSystem::PluginManager::getObjectByName("PythonSettings");
if (!pythonSettings)
return;
QString logMessage;
const bool res = QMetaObject::invokeMethod(pythonSettings,
"detectPythonOnDevice",
Q_ARG(Utils::FilePaths, m_searchPaths),
Q_ARG(QString, m_device->displayName()),
Q_ARG(QString, m_sharedId),
Q_ARG(QString *, &logMessage));
QTC_CHECK(res);
emit q->logOutput('\n' + logMessage);
}
QList<Id> KitDetectorPrivate::autoDetectCMake()
{
QList<Id> result;
@@ -302,6 +340,7 @@ void KitDetectorPrivate::autoDetect()
const QList<Id> cmakeIds = autoDetectCMake();
const Id cmakeId = cmakeIds.empty() ? Id() : cmakeIds.first();
autoDetectDebugger();
autoDetectPython();
const auto initializeKit = [this, toolchains, qtVersions, cmakeId](Kit *k) {
k->setAutoDetected(false);