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

Haskell: Use new setup pattern for HaskellBuildConfigurationFactory

Browse Source 
Change-Id: I4b8598157a8be20d3447dc7c4e3196700ec3d490
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-11-20 12:49:42 +01:00
parent e28110f6fd
commit f0574fdb9b
3 changed files with 97 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
src/plugins/haskell/haskellbuildconfiguration.cpp
View File

@@ -6,11 +6,14 @@
#include "haskellconstants.h"
#include "haskelltr.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildinfo.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/namedwidget.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <utils/algorithm.h>
#include <utils/detailswidget.h>
#include <utils/mimeutils.h>
@@ -23,89 +26,107 @@
using namespace ProjectExplorer;
const char C_HASKELL_BUILDCONFIGURATION_ID[] = "Haskell.BuildConfiguration";
namespace Haskell::Internal {
namespace Haskell {
namespace Internal {
HaskellBuildConfigurationFactory::HaskellBuildConfigurationFactory()
class HaskellBuildConfiguration final : public BuildConfiguration
{
registerBuildConfiguration<HaskellBuildConfiguration>(C_HASKELL_BUILDCONFIGURATION_ID);
setSupportedProjectType(Constants::C_HASKELL_PROJECT_ID);
setSupportedProjectMimeTypeName(Constants::C_HASKELL_PROJECT_MIMETYPE);
public:
HaskellBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id)
{
setInitializer([this](const BuildInfo &info) {
setBuildDirectory(info.buildDirectory);
setBuildType(info.buildType);
setDisplayName(info.displayName);
});
appendInitialBuildStep(Constants::C_STACK_BUILD_STEP_ID);
}
setBuildGenerator([](const Kit *k, const Utils::FilePath &projectPath, bool forSetup) {
BuildInfo info;
info.typeName = Tr::tr("Release");
if (forSetup) {
info.displayName = info.typeName;
info.buildDirectory = projectPath.parentDir().pathAppended(".stack-work");
}
info.kitId = k->id();
info.buildType = BuildConfiguration::BuildType::Release;
return QList<BuildInfo>{info};
});
}
NamedWidget *createConfigWidget() final;
HaskellBuildConfiguration::HaskellBuildConfiguration(Target *target, Utils::Id id)
: BuildConfiguration(target, id)
BuildType buildType() const final
{
return m_buildType;
}
void setBuildType(BuildType type)
{
m_buildType = type;
}
private:
BuildType m_buildType = BuildType::Release;
};
class HaskellBuildConfigurationWidget final : public NamedWidget
{
setInitializer([this](const BuildInfo &info) {
setBuildDirectory(info.buildDirectory);
setBuildType(info.buildType);
setDisplayName(info.displayName);
});
appendInitialBuildStep(Constants::C_STACK_BUILD_STEP_ID);
}
public:
HaskellBuildConfigurationWidget(HaskellBuildConfiguration *bc)
: NamedWidget(Tr::tr("General"))
{
setLayout(new QVBoxLayout);
layout()->setContentsMargins(0, 0, 0, 0);
auto box = new Utils::DetailsWidget;
box->setState(Utils::DetailsWidget::NoSummary);
layout()->addWidget(box);
auto details = new QWidget;
box->setWidget(details);
details->setLayout(new QHBoxLayout);
details->layout()->setContentsMargins(0, 0, 0, 0);
details->layout()->addWidget(new QLabel(Tr::tr("Build directory:")));
auto buildDirectoryInput = new Utils::PathChooser;
buildDirectoryInput->setExpectedKind(Utils::PathChooser::Directory);
buildDirectoryInput->setFilePath(bc->buildDirectory());
details->layout()->addWidget(buildDirectoryInput);
connect(bc,
&BuildConfiguration::buildDirectoryChanged,
buildDirectoryInput,
[bc, buildDirectoryInput] {
buildDirectoryInput->setFilePath(bc->buildDirectory());
});
connect(buildDirectoryInput,
&Utils::PathChooser::textChanged,
bc,
[bc, buildDirectoryInput](const QString &) {
bc->setBuildDirectory(buildDirectoryInput->rawFilePath());
});
}
};
NamedWidget *HaskellBuildConfiguration::createConfigWidget()
{
return new HaskellBuildConfigurationWidget(this);
}
BuildConfiguration::BuildType HaskellBuildConfiguration::buildType() const
class HaskellBuildConfigurationFactory final : public BuildConfigurationFactory
{
return m_buildType;
public:
HaskellBuildConfigurationFactory()
{
registerBuildConfiguration<HaskellBuildConfiguration>("Haskell.BuildConfiguration");
setSupportedProjectType(Constants::C_HASKELL_PROJECT_ID);
setSupportedProjectMimeTypeName(Constants::C_HASKELL_PROJECT_MIMETYPE);
setBuildGenerator([](const Kit *k, const Utils::FilePath &projectPath, bool forSetup) {
BuildInfo info;
info.typeName = Tr::tr("Release");
if (forSetup) {
info.displayName = info.typeName;
info.buildDirectory = projectPath.parentDir().pathAppended(".stack-work");
}
info.kitId = k->id();
info.buildType = BuildConfiguration::BuildType::Release;
return QList<BuildInfo>{info};
});
}
};
void setupHaskellBuildConfiguration()
{
static HaskellBuildConfigurationFactory theHaskellBuildConfigurationFactory;
}
void HaskellBuildConfiguration::setBuildType(BuildConfiguration::BuildType type)
{
m_buildType = type;
}
HaskellBuildConfigurationWidget::HaskellBuildConfigurationWidget(HaskellBuildConfiguration *bc)
: NamedWidget(Tr::tr("General"))
, m_buildConfiguration(bc)
{
setLayout(new QVBoxLayout);
layout()->setContentsMargins(0, 0, 0, 0);
auto box = new Utils::DetailsWidget;
box->setState(Utils::DetailsWidget::NoSummary);
layout()->addWidget(box);
auto details = new QWidget;
box->setWidget(details);
details->setLayout(new QHBoxLayout);
details->layout()->setContentsMargins(0, 0, 0, 0);
details->layout()->addWidget(new QLabel(Tr::tr("Build directory:")));
auto buildDirectoryInput = new Utils::PathChooser;
buildDirectoryInput->setExpectedKind(Utils::PathChooser::Directory);
buildDirectoryInput->setFilePath(m_buildConfiguration->buildDirectory());
details->layout()->addWidget(buildDirectoryInput);
connect(m_buildConfiguration,
&BuildConfiguration::buildDirectoryChanged,
buildDirectoryInput,
[this, buildDirectoryInput] {
buildDirectoryInput->setFilePath(m_buildConfiguration->buildDirectory());
});
connect(buildDirectoryInput,
&Utils::PathChooser::textChanged,
m_buildConfiguration,
[this, buildDirectoryInput](const QString &) {
m_buildConfiguration->setBuildDirectory(buildDirectoryInput->rawFilePath());
});
}
} // namespace Internal
} // namespace Haskell
} // Haskell::Internal

41
src/plugins/haskell/haskellbuildconfiguration.h
View File

@@ -3,43 +3,8 @@
#pragma once
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/namedwidget.h>
namespace Haskell::Internal {
namespace Haskell {
namespace Internal {
void setupHaskellBuildConfiguration();
class HaskellBuildConfigurationFactory : public ProjectExplorer::BuildConfigurationFactory
{
public:
HaskellBuildConfigurationFactory();
};
class HaskellBuildConfiguration : public ProjectExplorer::BuildConfiguration
{
Q_OBJECT
public:
HaskellBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id);
ProjectExplorer::NamedWidget *createConfigWidget() override;
BuildType buildType() const override;
void setBuildType(BuildType type);
private:
BuildType m_buildType = BuildType::Release;
};
class HaskellBuildConfigurationWidget : public ProjectExplorer::NamedWidget
{
Q_OBJECT
public:
HaskellBuildConfigurationWidget(HaskellBuildConfiguration *bc);
private:
HaskellBuildConfiguration *m_buildConfiguration;
};
} // namespace Internal
} // namespace Haskell
} // Haskell::Internal

2
src/plugins/haskell/haskellplugin.cpp
View File

@@ -30,7 +30,6 @@ class HaskellPluginPrivate
{
public:
HaskellEditorFactory editorFactory;
HaskellBuildConfigurationFactory buildConfigFactory;
HaskellRunConfigurationFactory runConfigFactory;
ProjectExplorer::SimpleTargetRunnerFactory runWorkerFactory{{Constants::C_HASKELL_RUNCONFIG_ID}};
};
@@ -59,6 +58,7 @@ private:
d = new HaskellPluginPrivate;
setupHaskellStackBuildStep();
setupHaskellBuildConfiguration();
ProjectExplorer::ProjectManager::registerProjectType<HaskellProject>(
Constants::C_HASKELL_PROJECT_MIMETYPE);