2017-05-04 12:16:38 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
|
|
|
|
** 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.
|
|
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "qbsinstallstep.h"
|
|
|
|
|
|
|
|
|
|
#include "qbsbuildconfiguration.h"
|
|
|
|
|
#include "qbsbuildstep.h"
|
|
|
|
|
#include "qbsproject.h"
|
|
|
|
|
#include "qbsprojectmanagerconstants.h"
|
|
|
|
|
|
|
|
|
|
#include "ui_qbsinstallstepconfigwidget.h"
|
|
|
|
|
|
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
|
#include <projectexplorer/buildsteplist.h>
|
|
|
|
|
#include <projectexplorer/deployconfiguration.h>
|
|
|
|
|
#include <projectexplorer/kit.h>
|
|
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
|
|
|
#include <projectexplorer/target.h>
|
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
|
|
|
|
|
|
#include <QFileInfo>
|
|
|
|
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
// Constants:
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
static const char QBS_REMOVE_FIRST[] = "Qbs.RemoveFirst";
|
|
|
|
|
static const char QBS_DRY_RUN[] = "Qbs.DryRun";
|
|
|
|
|
static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
|
|
|
|
|
|
|
|
|
|
namespace QbsProjectManager {
|
|
|
|
|
namespace Internal {
|
|
|
|
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
// QbsInstallStep:
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
QbsInstallStep::QbsInstallStep(ProjectExplorer::BuildStepList *bsl) :
|
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6fb2ec did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-29 12:28:40 +01:00
|
|
|
ProjectExplorer::BuildStep(bsl, Constants::QBS_INSTALLSTEP_ID)
|
2017-05-04 12:16:38 +02:00
|
|
|
{
|
|
|
|
|
setDisplayName(tr("Qbs Install"));
|
|
|
|
|
|
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6fb2ec did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-29 12:28:40 +01:00
|
|
|
const QbsBuildConfiguration * const bc = buildConfig();
|
|
|
|
|
connect(bc, &QbsBuildConfiguration::qbsConfigurationChanged,
|
|
|
|
|
this, &QbsInstallStep::handleBuildConfigChanged);
|
|
|
|
|
if (bc->qbsStep()) {
|
|
|
|
|
connect(bc->qbsStep(), &QbsBuildStep::qbsBuildOptionsChanged,
|
|
|
|
|
this, &QbsInstallStep::handleBuildConfigChanged);
|
|
|
|
|
}
|
2017-05-04 12:16:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QbsInstallStep::~QbsInstallStep()
|
|
|
|
|
{
|
|
|
|
|
cancel();
|
|
|
|
|
if (m_job)
|
|
|
|
|
m_job->deleteLater();
|
|
|
|
|
m_job = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::init(QList<const BuildStep *> &earlierSteps)
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(earlierSteps);
|
|
|
|
|
QTC_ASSERT(!static_cast<QbsProject *>(project())->isParsing() && !m_job, return false);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::run(QFutureInterface<bool> &fi)
|
|
|
|
|
{
|
|
|
|
|
m_fi = &fi;
|
|
|
|
|
|
|
|
|
|
QbsProject *pro = static_cast<QbsProject *>(project());
|
|
|
|
|
m_job = pro->install(m_qbsInstallOptions);
|
|
|
|
|
|
|
|
|
|
if (!m_job) {
|
|
|
|
|
reportRunResult(*m_fi, false);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_progressBase = 0;
|
|
|
|
|
|
|
|
|
|
connect(m_job, &qbs::AbstractJob::finished, this, &QbsInstallStep::installDone);
|
|
|
|
|
connect(m_job, &qbs::AbstractJob::taskStarted,
|
|
|
|
|
this, &QbsInstallStep::handleTaskStarted);
|
|
|
|
|
connect(m_job, &qbs::AbstractJob::taskProgress,
|
|
|
|
|
this, &QbsInstallStep::handleProgress);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ProjectExplorer::BuildStepConfigWidget *QbsInstallStep::createConfigWidget()
|
|
|
|
|
{
|
|
|
|
|
return new QbsInstallStepConfigWidget(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::runInGuiThread() const
|
|
|
|
|
{
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::cancel()
|
|
|
|
|
{
|
|
|
|
|
if (m_job)
|
|
|
|
|
m_job->cancel();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString QbsInstallStep::installRoot() const
|
|
|
|
|
{
|
|
|
|
|
const QbsBuildStep * const bs = buildConfig()->qbsStep();
|
|
|
|
|
return bs ? bs->installRoot().toString() : QString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::removeFirst() const
|
|
|
|
|
{
|
|
|
|
|
return m_qbsInstallOptions.removeExistingInstallation();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::dryRun() const
|
|
|
|
|
{
|
|
|
|
|
return m_qbsInstallOptions.dryRun();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::keepGoing() const
|
|
|
|
|
{
|
|
|
|
|
return m_qbsInstallOptions.keepGoing();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const QbsBuildConfiguration *QbsInstallStep::buildConfig() const
|
|
|
|
|
{
|
|
|
|
|
return static_cast<QbsBuildConfiguration *>(
|
|
|
|
|
deployConfiguration()->target()->activeBuildConfiguration());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool QbsInstallStep::fromMap(const QVariantMap &map)
|
|
|
|
|
{
|
|
|
|
|
if (!ProjectExplorer::BuildStep::fromMap(map))
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
m_qbsInstallOptions.setInstallRoot(installRoot());
|
|
|
|
|
m_qbsInstallOptions.setRemoveExistingInstallation(
|
|
|
|
|
map.value(QLatin1String(QBS_REMOVE_FIRST), false).toBool());
|
|
|
|
|
m_qbsInstallOptions.setDryRun(map.value(QLatin1String(QBS_DRY_RUN), false).toBool());
|
|
|
|
|
m_qbsInstallOptions.setKeepGoing(map.value(QLatin1String(QBS_KEEP_GOING), false).toBool());
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QVariantMap QbsInstallStep::toMap() const
|
|
|
|
|
{
|
|
|
|
|
QVariantMap map = ProjectExplorer::BuildStep::toMap();
|
|
|
|
|
map.insert(QLatin1String(QBS_REMOVE_FIRST), m_qbsInstallOptions.removeExistingInstallation());
|
|
|
|
|
map.insert(QLatin1String(QBS_DRY_RUN), m_qbsInstallOptions.dryRun());
|
|
|
|
|
map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsInstallOptions.keepGoing());
|
|
|
|
|
return map;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
qbs::InstallOptions QbsInstallStep::installOptions() const
|
|
|
|
|
{
|
|
|
|
|
return m_qbsInstallOptions;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::installDone(bool success)
|
|
|
|
|
{
|
|
|
|
|
// Report errors:
|
|
|
|
|
foreach (const qbs::ErrorItem &item, m_job->error().items()) {
|
|
|
|
|
createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
|
|
|
|
|
item.codeLocation().filePath(), item.codeLocation().line());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QTC_ASSERT(m_fi, return);
|
|
|
|
|
reportRunResult(*m_fi, success);
|
|
|
|
|
m_fi = 0; // do not delete, it is not ours
|
|
|
|
|
m_job->deleteLater();
|
|
|
|
|
m_job = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::handleTaskStarted(const QString &desciption, int max)
|
|
|
|
|
{
|
|
|
|
|
Q_UNUSED(desciption);
|
|
|
|
|
QTC_ASSERT(m_fi, return);
|
|
|
|
|
m_progressBase = m_fi->progressValue();
|
|
|
|
|
m_fi->setProgressRange(0, m_progressBase + max);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::handleProgress(int value)
|
|
|
|
|
{
|
|
|
|
|
QTC_ASSERT(m_fi, return);
|
|
|
|
|
m_fi->setProgressValue(m_progressBase + value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type,
|
|
|
|
|
const QString &message, const QString &file, int line)
|
|
|
|
|
{
|
|
|
|
|
ProjectExplorer::Task task = ProjectExplorer::Task(type, message,
|
|
|
|
|
Utils::FileName::fromString(file), line,
|
|
|
|
|
ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
|
|
|
|
|
emit addTask(task, 1);
|
|
|
|
|
emit addOutput(message, OutputFormat::Stdout);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::setRemoveFirst(bool rf)
|
|
|
|
|
{
|
|
|
|
|
if (m_qbsInstallOptions.removeExistingInstallation() == rf)
|
|
|
|
|
return;
|
|
|
|
|
m_qbsInstallOptions.setRemoveExistingInstallation(rf);
|
|
|
|
|
emit changed();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::setDryRun(bool dr)
|
|
|
|
|
{
|
|
|
|
|
if (m_qbsInstallOptions.dryRun() == dr)
|
|
|
|
|
return;
|
|
|
|
|
m_qbsInstallOptions.setDryRun(dr);
|
|
|
|
|
emit changed();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::setKeepGoing(bool kg)
|
|
|
|
|
{
|
|
|
|
|
if (m_qbsInstallOptions.keepGoing() == kg)
|
|
|
|
|
return;
|
|
|
|
|
m_qbsInstallOptions.setKeepGoing(kg);
|
|
|
|
|
emit changed();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStep::handleBuildConfigChanged()
|
|
|
|
|
{
|
|
|
|
|
m_qbsInstallOptions.setInstallRoot(installRoot());
|
|
|
|
|
emit changed();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
// QbsInstallStepConfigWidget:
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
QbsInstallStepConfigWidget::QbsInstallStepConfigWidget(QbsInstallStep *step) :
|
|
|
|
|
m_step(step), m_ignoreChange(false)
|
|
|
|
|
{
|
|
|
|
|
connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
|
|
|
|
|
this, &QbsInstallStepConfigWidget::updateState);
|
|
|
|
|
connect(m_step, &QbsInstallStep::changed,
|
|
|
|
|
this, &QbsInstallStepConfigWidget::updateState);
|
|
|
|
|
|
|
|
|
|
setContentsMargins(0, 0, 0, 0);
|
|
|
|
|
|
|
|
|
|
QbsProject *project = static_cast<QbsProject *>(m_step->project());
|
|
|
|
|
|
|
|
|
|
m_ui = new Ui::QbsInstallStepConfigWidget;
|
|
|
|
|
m_ui->setupUi(this);
|
|
|
|
|
|
|
|
|
|
connect(m_ui->removeFirstCheckBox, &QAbstractButton::toggled,
|
|
|
|
|
this, &QbsInstallStepConfigWidget::changeRemoveFirst);
|
|
|
|
|
connect(m_ui->dryRunCheckBox, &QAbstractButton::toggled,
|
|
|
|
|
this, &QbsInstallStepConfigWidget::changeDryRun);
|
|
|
|
|
connect(m_ui->keepGoingCheckBox, &QAbstractButton::toggled,
|
|
|
|
|
this, &QbsInstallStepConfigWidget::changeKeepGoing);
|
|
|
|
|
|
2017-07-13 10:51:15 +02:00
|
|
|
connect(project, &ProjectExplorer::Project::parsingFinished,
|
2017-05-04 12:16:38 +02:00
|
|
|
this, &QbsInstallStepConfigWidget::updateState);
|
|
|
|
|
|
|
|
|
|
updateState();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QbsInstallStepConfigWidget::~QbsInstallStepConfigWidget()
|
|
|
|
|
{
|
|
|
|
|
delete m_ui;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString QbsInstallStepConfigWidget::summaryText() const
|
|
|
|
|
{
|
|
|
|
|
return m_summary;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString QbsInstallStepConfigWidget::displayName() const
|
|
|
|
|
{
|
|
|
|
|
return m_step->displayName();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStepConfigWidget::updateState()
|
|
|
|
|
{
|
|
|
|
|
if (!m_ignoreChange) {
|
|
|
|
|
m_ui->installRootValueLabel->setText(m_step->installRoot());
|
|
|
|
|
m_ui->removeFirstCheckBox->setChecked(m_step->removeFirst());
|
|
|
|
|
m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
|
|
|
|
|
m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QString command = m_step->buildConfig()->equivalentCommandLine(m_step);
|
|
|
|
|
|
|
|
|
|
m_ui->commandLineTextEdit->setPlainText(command);
|
|
|
|
|
|
|
|
|
|
QString summary = tr("<b>Qbs:</b> %1").arg(command);
|
|
|
|
|
if (m_summary != summary) {
|
|
|
|
|
m_summary = summary;
|
|
|
|
|
emit updateSummary();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStepConfigWidget::changeRemoveFirst(bool rf)
|
|
|
|
|
{
|
|
|
|
|
m_step->setRemoveFirst(rf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStepConfigWidget::changeDryRun(bool dr)
|
|
|
|
|
{
|
|
|
|
|
m_step->setDryRun(dr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void QbsInstallStepConfigWidget::changeKeepGoing(bool kg)
|
|
|
|
|
{
|
|
|
|
|
m_step->setKeepGoing(kg);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
// QbsInstallStepFactory:
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6fb2ec did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-29 12:28:40 +01:00
|
|
|
QbsInstallStepFactory::QbsInstallStepFactory()
|
2017-05-04 12:16:38 +02:00
|
|
|
{
|
ProjectExplorer/all: Re-organize BuildSteps/{Deploy,Build}Config setup
This follow the rough pattern of recent *RunConfigurationFactory changes
for build and deploy configurations.
- Collapse the two lines of constructors similar to what
890c1906e6fb2ec did for RunConfigurations
* Deploy* was purely mechanical
* Build* ctors are split in connects() in the ctor body
to create "empty shell for clone" etc
and build step additions in initialize() functions which
are only used in the create() case.
-- Allows to collapse the shared 'ctor()' functions, too.
- Move FooBuildConfigurationFactory::create() implementations
to FooBuildConfiguration() constructor. That was a strange
and unneeded ping-pong between factories and objects, and
furthermore allows one level less of indirection (and for a
later, left out here, some reduction of the
FooBuildConfiguration interfaces that were only used to
accommodate the *Factory::create() functions.
- Most {Build,Deploy}Configuration{,Factory} classes had a canHandle(),
but there wasn't one in the base classses. Have one there.
- Most canHandle() functions were checking simple restrictions on
e.g. project or target types, specify those by setters in the
constructors instead and check them in the base canHandle()
- clone() is generally replaced by a creation of a "shell object"
and a fromMap(source->toMap()), implemented in the base, there
are two cases left for Android and Qbs that needed(?) some extra
polish
- generally use canHandle() in base implementation, instead
of doing that in all Derived::canFoo()
- as a result, canCreate/create/canClone/clone reimplementations
are not needed anymore, keep the base implementation for
now (could be inlined into their only users later), but
de-virtualize them.
- Combine Ios{Preset,DSym}BuildStepFactory. There was only one
'dsym' build step they could create.
- Split the 'mangled' id into the ProjectConfiguration subtype
specific constant identifier, and a QString extraId() bit.
Only maintain the mangled id in saved settings.
- Make ProjectConfiguration::m_id a constant member, adapt
all constructors of derived classe.
Not done in this patch:
- Finish possible cosmetic changes on top
- Add a way to specify restrictions to supported Qt versions
(used in Android/Ios), as the base implementation does not
depend on the qtsupport plugin
- Combine the QList<X> availableFoo() + createFoo(X) function
pairs to somthing like a direct
QList<struct { X; std::function<X()>; }> fooCreators()
to avoid e.g. the baseId.withSuffix() <-> id.suffixAfter(base)
pingpong
- Remove the *Factories from the global object pool
- Do something about priority(). Falling back to plain
qmake in android+qmake setup is not helpful.
Change-Id: I2be7d88d554c5aa8b7db8edf5b93278e1ae0112a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-29 12:28:40 +01:00
|
|
|
registerStep<QbsInstallStep>(Constants::QBS_INSTALLSTEP_ID);
|
|
|
|
|
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
|
|
|
|
|
setSupportedDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
|
|
|
|
|
setSupportedProjectType(Constants::PROJECT_ID);
|
|
|
|
|
setDisplayName(tr("Qbs Install"));
|
2017-05-04 12:16:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace Internal
|
|
|
|
|
} // namespace QbsProjectManager
|