forked from qt-creator/qt-creator
b72d5b05f8
By default xcodebuild does not try create / download a provisioning profile for a project if a valid one does not exist locally in ~/Library/MobileDevice/Provisioning Profiles, even if the Xcode CODE_SIGN_STYLE attribute is set to Automatic. Starting with Xcode 9, xcodebuild accepts a new -allowProvisioningUpdates option. When passed, xcodebuild will request a new provisioning profile from Apple's servers for the current project and use it during the build. The provisioning profile is only needed when building for a real device, not the simulator. When building an iOS project with qmake, the option is embedded in the wrapping Makefile generated by qmake, so Qt Creator can simply call make (which it does). For CMake, there is no wrapping Makefile, so we need to pass the new option explicitly as an additional build tool argument. There might be cases where automatic provisioning is not desired, which is why there is now a new checkbox in the CMake build step configuration widget. It's default value is 'enabled', to match qmake's behavior. As an implementation detail, isiOS had to be moved to a header file so it's accessible to both the build configuration and the build step. Fixes: QTCREATORBUG-26246 Change-Id: Ic80cd965ba095d0ff379e13ad2ffb8c298c9f7c4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
125 lines
3.8 KiB
C++
125 lines
3.8 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include <projectexplorer/abstractprocessstep.h>
|
|
#include <utils/treemodel.h>
|
|
|
|
namespace Utils {
|
|
class CommandLine;
|
|
class StringAspect;
|
|
} // Utils
|
|
|
|
namespace CMakeProjectManager {
|
|
namespace Internal {
|
|
|
|
class CMakeBuildStep;
|
|
|
|
class CMakeTargetItem : public Utils::TreeItem
|
|
{
|
|
public:
|
|
CMakeTargetItem() = default;
|
|
CMakeTargetItem(const QString &target, CMakeBuildStep *step, bool special);
|
|
|
|
private:
|
|
QVariant data(int column, int role) const final;
|
|
bool setData(int column, const QVariant &data, int role) final;
|
|
Qt::ItemFlags flags(int column) const final;
|
|
|
|
QString m_target;
|
|
CMakeBuildStep *m_step = nullptr;
|
|
bool m_special = false;
|
|
};
|
|
|
|
class CMakeBuildStep : public ProjectExplorer::AbstractProcessStep
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
CMakeBuildStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
|
|
|
|
QStringList buildTargets() const;
|
|
void setBuildTargets(const QStringList &target);
|
|
|
|
bool buildsBuildTarget(const QString &target) const;
|
|
void setBuildsBuildTarget(const QString &target, bool on);
|
|
|
|
QVariantMap toMap() const override;
|
|
|
|
QString cleanTarget() const;
|
|
QString allTarget() const ;
|
|
QString installTarget() const;
|
|
static QStringList specialTargets(bool allCapsTargets);
|
|
|
|
QString activeRunConfigTarget() const;
|
|
|
|
signals:
|
|
void buildTargetsChanged();
|
|
|
|
private:
|
|
Utils::CommandLine cmakeCommand() const;
|
|
|
|
void processFinished(int exitCode, QProcess::ExitStatus status) override;
|
|
bool fromMap(const QVariantMap &map) override;
|
|
|
|
bool init() override;
|
|
void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
|
|
void doRun() override;
|
|
QWidget *createConfigWidget() override;
|
|
|
|
QString defaultBuildTarget() const;
|
|
|
|
void runImpl();
|
|
void handleProjectWasParsed(bool success);
|
|
|
|
void handleBuildTargetsChanges(bool success);
|
|
void recreateBuildTargetsModel();
|
|
void updateBuildTargetsModel();
|
|
|
|
QMetaObject::Connection m_runTrigger;
|
|
|
|
friend class CMakeBuildStepConfigWidget;
|
|
QStringList m_buildTargets; // Convention: Empty string member signifies "Current executable"
|
|
Utils::StringAspect *m_cmakeArguments = nullptr;
|
|
Utils::StringAspect *m_toolArguments = nullptr;
|
|
Utils::BoolAspect *m_useiOSAutomaticProvisioningUpdates = nullptr;
|
|
bool m_waiting = false;
|
|
|
|
QString m_allTarget = "all";
|
|
QString m_installTarget = "install";
|
|
|
|
Utils::TreeModel<Utils::TreeItem, CMakeTargetItem> m_buildTargetModel;
|
|
};
|
|
|
|
class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
|
|
{
|
|
public:
|
|
CMakeBuildStepFactory();
|
|
};
|
|
|
|
} // namespace Internal
|
|
} // namespace CMakeProjectManager
|