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

Add signing options to CMake/iOS build configuration

Browse Source 
Adds the signing settings to iOS configurations.
Adds placeholders for signing flags to the initial CMake arguments, and
updates the CMake configuration when signing settings change.

The new configuration doesn't get automatically applied. Only the "Apply
Configuration Changes" button gets enabled and the user has to press
that explicitly. This seems to be a more general issue affecting the QML
debugging setting too, though.

Task-number: QTCREATORBUG-23574
Change-Id: I3e8d45f565347e1ad2ac274a21b1552f1510e8f4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-02-04 14:53:42 +01:00
parent 865d87a75f
commit 9bd8dc41d2
12 changed files with 290 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/builddirparameters.cpp
View File

@@ -53,10 +53,12 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
const Utils::MacroExpander *expander = bc->macroExpander();
initialCMakeArguments = Utils::transform(bc->initialCMakeArguments(),
[expander](const QString &s) {
return expander->expand(s);
});
const QStringList expandedArguments = Utils::transform(bc->initialCMakeArguments(),
[expander](const QString &s) {
return expander->expand(s);
});
initialCMakeArguments = Utils::filtered(expandedArguments,
[](const QString &s) { return !s.isEmpty(); });
extraCMakeArguments = Utils::transform(bc->extraCMakeArguments(),
[expander](const QString &s) {
return expander->expand(s);

3
src/plugins/cmakeprojectmanager/builddirparameters.h
View File

@@ -35,10 +35,11 @@
#include <QString>
namespace CMakeProjectManager {
namespace Internal {
class CMakeBuildConfiguration;
namespace Internal {
class BuildDirParameters {
public:
BuildDirParameters();

124
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -77,13 +77,17 @@
using namespace ProjectExplorer;
using namespace Utils;
using namespace CMakeProjectManager::Internal;
namespace CMakeProjectManager {
namespace Internal {
static Q_LOGGING_CATEGORY(cmakeBuildConfigurationLog, "qtc.cmake.bc", QtWarningMsg);
const char CONFIGURATION_KEY[] = "CMake.Configuration";
const char DEVELOPMENT_TEAM_FLAG[] = "Ios:DevelopmentTeam:Flag";
const char PROVISIONING_PROFILE_FLAG[] = "Ios:ProvisioningProfile:Flag";
namespace Internal {
class CMakeBuildSettingsWidget : public NamedWidget
{
@@ -98,6 +102,7 @@ private:
void updateAdvancedCheckBox();
void updateFromKit();
CMakeProjectManager::CMakeConfig getQmlDebugCxxFlags();
CMakeProjectManager::CMakeConfig getSigningFlagsChanges();
void updateSelection();
void setVariableUnsetFlag(bool unsetFlag);
@@ -339,6 +344,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
connect(m_configModel, &QAbstractItemModel::modelReset,
this, &CMakeBuildSettingsWidget::updateButtonState);
connect(m_buildConfiguration,
&CMakeBuildConfiguration::signingFlagsChanged,
this,
&CMakeBuildSettingsWidget::updateButtonState);
connect(m_showAdvancedCheckBox, &QCheckBox::stateChanged,
this, &CMakeBuildSettingsWidget::updateAdvancedCheckBox);
@@ -426,35 +436,36 @@ void CMakeBuildSettingsWidget::updateButtonState()
const QList<ConfigModel::DataItem> changes = m_configModel->configurationForCMake();
const CMakeConfig configChanges
= getQmlDebugCxxFlags() + Utils::transform(changes, [](const ConfigModel::DataItem &i) {
CMakeConfigItem ni;
ni.key = i.key.toUtf8();
ni.value = i.value.toUtf8();
ni.documentation = i.description.toUtf8();
ni.isAdvanced = i.isAdvanced;
ni.isUnset = i.isUnset;
ni.inCMakeCache = i.inCMakeCache;
ni.values = i.values;
switch (i.type) {
case CMakeProjectManager::ConfigModel::DataItem::BOOLEAN:
ni.type = CMakeConfigItem::BOOL;
break;
case CMakeProjectManager::ConfigModel::DataItem::FILE:
ni.type = CMakeConfigItem::FILEPATH;
break;
case CMakeProjectManager::ConfigModel::DataItem::DIRECTORY:
ni.type = CMakeConfigItem::PATH;
break;
case CMakeProjectManager::ConfigModel::DataItem::STRING:
ni.type = CMakeConfigItem::STRING;
break;
case CMakeProjectManager::ConfigModel::DataItem::UNKNOWN:
default:
ni.type = CMakeConfigItem::INTERNAL;
break;
}
return ni;
});
= getQmlDebugCxxFlags() + getSigningFlagsChanges()
+ Utils::transform(changes, [](const ConfigModel::DataItem &i) {
CMakeConfigItem ni;
ni.key = i.key.toUtf8();
ni.value = i.value.toUtf8();
ni.documentation = i.description.toUtf8();
ni.isAdvanced = i.isAdvanced;
ni.isUnset = i.isUnset;
ni.inCMakeCache = i.inCMakeCache;
ni.values = i.values;
switch (i.type) {
case CMakeProjectManager::ConfigModel::DataItem::BOOLEAN:
ni.type = CMakeConfigItem::BOOL;
break;
case CMakeProjectManager::ConfigModel::DataItem::FILE:
ni.type = CMakeConfigItem::FILEPATH;
break;
case CMakeProjectManager::ConfigModel::DataItem::DIRECTORY:
ni.type = CMakeConfigItem::PATH;
break;
case CMakeProjectManager::ConfigModel::DataItem::STRING:
ni.type = CMakeConfigItem::STRING;
break;
case CMakeProjectManager::ConfigModel::DataItem::UNKNOWN:
default:
ni.type = CMakeConfigItem::INTERNAL;
break;
}
return ni;
});
m_resetButton->setEnabled(m_configModel->hasChanges() && !isParsing);
m_reconfigureButton->setEnabled((!configChanges.isEmpty() || m_configModel->hasCMakeChanges())
@@ -525,6 +536,28 @@ CMakeConfig CMakeBuildSettingsWidget::getQmlDebugCxxFlags()
return changedConfig;
}
CMakeConfig CMakeBuildSettingsWidget::getSigningFlagsChanges()
{
const CMakeConfig flags = m_buildConfiguration->signingFlags();
if (flags.isEmpty())
return {};
const CMakeConfig configList = m_buildConfiguration->configurationFromCMake();
if (configList.isEmpty()) {
// we don't have any configuration --> initial configuration takes care of this itself
return {};
}
CMakeConfig changedConfig;
for (const CMakeConfigItem &signingFlag : flags) {
const CMakeConfigItem existingFlag = Utils::findOrDefault(configList,
Utils::equal(&CMakeConfigItem::key,
signingFlag.key));
const bool notInConfig = existingFlag.key.isEmpty();
if (notInConfig != signingFlag.isUnset || existingFlag.value != signingFlag.value)
changedConfig.append(signingFlag);
}
return changedConfig;
}
void CMakeBuildSettingsWidget::updateSelection()
{
const QModelIndexList selectedIndexes = m_configView->selectionModel()->selectedIndexes();
@@ -662,6 +695,8 @@ static QStringList defaultInitialCMakeArguments(const Kit *k, const QString buil
return initialArgs;
}
} // namespace Internal
// -----------------------------------------------------------------------------
// CMakeBuildConfiguration:
// -----------------------------------------------------------------------------
@@ -696,6 +731,23 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
auto initialCMakeArgumentsAspect = addAspect<InitialCMakeArgumentsAspect>();
initialCMakeArgumentsAspect->setMacroExpanderProvider([this]{ return macroExpander(); });
macroExpander()->registerVariable(DEVELOPMENT_TEAM_FLAG,
tr("The CMake flag for the development team"),
[this] {
const CMakeConfig flags = signingFlags();
if (!flags.isEmpty())
return flags.first().toArgument();
return QString();
});
macroExpander()->registerVariable(PROVISIONING_PROFILE_FLAG,
tr("The CMake flag for the provisioning profile"),
[this] {
const CMakeConfig flags = signingFlags();
if (flags.size() > 1 && !flags.at(1).isUnset) {
return flags.at(1).toArgument();
}
return QString();
});
addAspect<SourceDirectoryAspect>();
addAspect<BuildTypeAspect>();
@@ -774,6 +826,8 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
"Qt6/qt.toolchain.cmake");
initialArgs.append("-DCMAKE_OSX_ARCHITECTURES:STRING=" + architecture);
initialArgs.append("-DCMAKE_OSX_SYSROOT:STRING=" + sysroot);
initialArgs.append("%{" + QLatin1String(DEVELOPMENT_TEAM_FLAG) + "}");
initialArgs.append("%{" + QLatin1String(PROVISIONING_PROFILE_FLAG) + "}");
}
}
@@ -972,14 +1026,18 @@ NamedWidget *CMakeBuildConfiguration::createConfigWidget()
return new CMakeBuildSettingsWidget(this);
}
CMakeConfig CMakeBuildConfiguration::signingFlags() const
{
return {};
}
/*!
\class CMakeBuildConfigurationFactory
*/
CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory()
{
registerBuildConfiguration<CMakeBuildConfiguration>(
"CMakeProjectManager.CMakeBuildConfiguration");
registerBuildConfiguration<CMakeBuildConfiguration>(Constants::CMAKE_BUILDCONFIGURATION_ID);
setSupportedProjectType(CMakeProjectManager::Constants::CMAKE_PROJECT_ID);
setSupportedProjectMimeTypeName(Constants::CMAKE_PROJECT_MIMETYPE);
@@ -1114,6 +1172,8 @@ void CMakeBuildConfiguration::setCMakeBuildType(const QString &cmakeBuildType)
aspect<BuildTypeAspect>()->setValue(cmakeBuildType);
}
namespace Internal {
// ----------------------------------------------------------------------
// - InitialCMakeParametersAspect:
// ----------------------------------------------------------------------

35
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -25,6 +25,7 @@
#pragma once
#include "cmake_global.h"
#include "cmakeconfigitem.h"
#include "configmodel.h"
@@ -38,16 +39,18 @@ namespace Internal {
class CMakeBuildSystem;
class CMakeBuildSettingsWidget;
class CMakeProjectImporter;
class CMakeBuildConfiguration final : public ProjectExplorer::BuildConfiguration
} // namespace Internal
class CMAKE_EXPORT CMakeBuildConfiguration : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
friend class ProjectExplorer::BuildConfigurationFactory;
CMakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
~CMakeBuildConfiguration() final;
public:
CMakeBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
~CMakeBuildConfiguration() override;
CMakeConfig configurationFromCMake() const;
QStringList extraCMakeArguments() const;
@@ -76,6 +79,10 @@ public:
signals:
void errorOccurred(const QString &message);
void warningOccurred(const QString &message);
void signingFlagsChanged();
protected:
bool fromMap(const QVariantMap &map) override;
private:
QVariantMap toMap() const override;
@@ -83,7 +90,7 @@ private:
ProjectExplorer::NamedWidget *createConfigWidget() override;
bool fromMap(const QVariantMap &map) override;
virtual CMakeConfig signingFlags() const;
enum ForceEnabledChanged { False, True };
void clearError(ForceEnabledChanged fec = ForceEnabledChanged::False);
@@ -101,17 +108,16 @@ private:
QString m_warning;
CMakeConfig m_configurationFromCMake;
CMakeBuildSystem *m_buildSystem = nullptr;
Internal::CMakeBuildSystem *m_buildSystem = nullptr;
QStringList m_extraCMakeArguments;
friend class CMakeBuildSettingsWidget;
friend class CMakeBuildSystem;
friend class Internal::CMakeBuildSettingsWidget;
friend class Internal::CMakeBuildSystem;
};
class CMakeProjectImporter;
class CMakeBuildConfigurationFactory final : public ProjectExplorer::BuildConfigurationFactory
class CMAKE_EXPORT CMakeBuildConfigurationFactory
: public ProjectExplorer::BuildConfigurationFactory
{
public:
CMakeBuildConfigurationFactory();
@@ -128,9 +134,11 @@ public:
private:
static ProjectExplorer::BuildInfo createBuildInfo(BuildType buildType);
friend class CMakeProjectImporter;
friend class Internal::CMakeProjectImporter;
};
namespace Internal {
class InitialCMakeArgumentsAspect final : public Utils::StringAspect
{
Q_OBJECT
@@ -155,6 +163,5 @@ public:
BuildTypeAspect();
};
} // namespace Internal
} // namespace CMakeProjectManager

3
src/plugins/cmakeprojectmanager/cmakebuildsystem.h
View File

@@ -43,10 +43,11 @@ class CppProjectUpdater;
} // namespace CppTools
namespace CMakeProjectManager {
namespace Internal {
class CMakeBuildConfiguration;
namespace Internal {
// --------------------------------------------------------------------
// CMakeBuildSystem:
// --------------------------------------------------------------------

2
src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
View File

@@ -42,6 +42,8 @@ const char CMAKE_HOME_DIR[] = "CMakeProject.HomeDirectory";
// Project
const char CMAKE_PROJECT_ID[] = "CMakeProjectManager.CMakeProject";
const char CMAKE_BUILDCONFIGURATION_ID[] = "CMakeProjectManager.CMakeBuildConfiguration";
// Menu
const char M_CONTEXT[] = "CMakeEditor.ContextMenu";