Meson: Flatten directory hierarchy

Keep tests/ and icons/ but put the rest into the toplevel.

The previous setup was so different from the rest of the bunch that
it regularly stuck out in maintenance tasks.

Change-Id: I69821be6268f69682353a388f6bb1fa343215303
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/mesonprojectmanager/mesonbuildconfiguration.cpp

@@ -0,0 +1,170 @@
+// Copyright (C) 2020 Alexis Jeandet.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
+
+#include "mesonbuildconfiguration.h"
+
+#include "mesonbuildsettingswidget.h"
+#include "mesonbuildsystem.h"
+#include "mesonpluginconstants.h"
+#include "mesonpluginconstants.h"
+#include "mesonwrapper.h"
+#include "ninjabuildstep.h"
+
+#include <projectexplorer/buildinfo.h>
+#include <projectexplorer/buildmanager.h>
+#include <projectexplorer/buildstep.h>
+#include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/kit.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
+
+#include <utils/fileutils.h>
+#include <utils/qtcprocess.h>
+
+#include <QDir>
+
+using namespace ProjectExplorer;
+using namespace Utils;
+
+namespace MesonProjectManager {
+namespace Internal {
+
+MesonBuildConfiguration::MesonBuildConfiguration(ProjectExplorer::Target *target, Utils::Id id)
+    : ProjectExplorer::BuildConfiguration{target, id}
+{
+    appendInitialBuildStep(Constants::MESON_BUILD_STEP_ID);
+    appendInitialCleanStep(Constants::MESON_BUILD_STEP_ID);
+    setInitializer([this, target](const ProjectExplorer::BuildInfo &info) {
+        m_buildType = mesonBuildType(info.typeName);
+        auto k = target->kit();
+        if (info.buildDirectory.isEmpty()) {
+            setBuildDirectory(shadowBuildDirectory(target->project()->projectFilePath(),
+                                                   k,
+                                                   info.displayName,
+                                                   info.buildType));
+        }
+        m_buildSystem = new MesonBuildSystem{this};
+    });
+}
+
+MesonBuildConfiguration::~MesonBuildConfiguration()
+{
+    delete m_buildSystem;
+}
+
+FilePath MesonBuildConfiguration::shadowBuildDirectory(const FilePath &projectFilePath,
+                                                       const Kit *k,
+                                                       const QString &bcName,
+                                                       BuildConfiguration::BuildType buildType)
+{
+    if (projectFilePath.isEmpty())
+        return {};
+
+    const QString projectName = projectFilePath.parentDir().fileName();
+    return buildDirectoryFromTemplate(Project::projectDirectory(projectFilePath), projectFilePath,
+                                      projectName, k, bcName, buildType, "meson");
+}
+
+ProjectExplorer::BuildSystem *MesonBuildConfiguration::buildSystem() const
+{
+    return m_buildSystem;
+}
+
+void MesonBuildConfiguration::build(const QString &target)
+{
+    auto mesonBuildStep = qobject_cast<NinjaBuildStep *>(
+        Utils::findOrDefault(buildSteps()->steps(), [](const ProjectExplorer::BuildStep *bs) {
+            return bs->id() == Constants::MESON_BUILD_STEP_ID;
+        }));
+
+    QString originalBuildTarget;
+    if (mesonBuildStep) {
+        originalBuildTarget = mesonBuildStep->targetName();
+        mesonBuildStep->setBuildTarget(target);
+    }
+
+    ProjectExplorer::BuildManager::buildList(buildSteps());
+
+    if (mesonBuildStep)
+        mesonBuildStep->setBuildTarget(originalBuildTarget);
+}
+
+QStringList MesonBuildConfiguration::mesonConfigArgs()
+{
+    return Utils::ProcessArgs::splitArgs(m_parameters) + QStringList{QString("-Dbuildtype=%1").arg(mesonBuildTypeName(m_buildType))};
+}
+
+const QString &MesonBuildConfiguration::parameters() const
+{
+    return m_parameters;
+}
+
+void MesonBuildConfiguration::setParameters(const QString &params)
+{
+    m_parameters = params;
+    emit parametersChanged();
+}
+
+QVariantMap MesonBuildConfiguration::toMap() const
+{
+    auto data = ProjectExplorer::BuildConfiguration::toMap();
+    data[Constants::BuildConfiguration::BUILD_TYPE_KEY] = mesonBuildTypeName(m_buildType);
+    data[Constants::BuildConfiguration::PARAMETERS_KEY] = m_parameters;
+    return data;
+}
+
+bool MesonBuildConfiguration::fromMap(const QVariantMap &map)
+{
+    auto res = ProjectExplorer::BuildConfiguration::fromMap(map);
+    m_buildSystem = new MesonBuildSystem{this};
+    m_buildType = mesonBuildType(
+        map.value(Constants::BuildConfiguration::BUILD_TYPE_KEY).toString());
+    m_parameters = map.value(Constants::BuildConfiguration::PARAMETERS_KEY).toString();
+    return res;
+}
+
+ProjectExplorer::NamedWidget *MesonBuildConfiguration::createConfigWidget()
+{
+    return new MesonBuildSettingsWidget{this};
+}
+
+ProjectExplorer::BuildInfo createBuildInfo(MesonBuildType type)
+{
+    ProjectExplorer::BuildInfo bInfo;
+    bInfo.typeName = mesonBuildTypeName(type);
+    bInfo.displayName = mesonBuildTypeDisplayName(type);
+    bInfo.buildType = buildType(type);
+    return bInfo;
+}
+
+MesonBuildConfigurationFactory::MesonBuildConfigurationFactory()
+{
+    registerBuildConfiguration<MesonBuildConfiguration>(Constants::MESON_BUILD_CONFIG_ID);
+    setSupportedProjectType(Constants::Project::ID);
+    setSupportedProjectMimeTypeName(Constants::Project::MIMETYPE);
+    setBuildGenerator(
+        [](const ProjectExplorer::Kit *k, const Utils::FilePath &projectPath, bool forSetup) {
+            QList<ProjectExplorer::BuildInfo> result;
+
+            Utils::FilePath path = forSetup
+                                       ? ProjectExplorer::Project::projectDirectory(projectPath)
+                                       : projectPath;
+            for (const auto &bType : {MesonBuildType::debug,
+                                      MesonBuildType::release,
+                                      MesonBuildType::debugoptimized,
+                                      MesonBuildType::minsize}) {
+                auto bInfo = createBuildInfo(bType);
+                if (forSetup)
+                    bInfo.buildDirectory
+                        = MesonBuildConfiguration::shadowBuildDirectory(projectPath,
+                                                                        k,
+                                                                        bInfo.typeName,
+                                                                        bInfo.buildType);
+                result << bInfo;
+            }
+            return result;
+        });
+}
+
+} // namespace Internal
+} // namespace MesonProjectManager