Meson: Merge the tool wrapper files

Change-Id: I055006e29ee8c2067275e64043c7a7ffcc460390
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-22 12:11:22 +02:00
parent d09063de87
commit 3197ef3ea6
13 changed files with 206 additions and 259 deletions

View File

@@ -3,11 +3,22 @@
#include "toolwrapper.h"
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <QFile>
#include <QFileInfo>
#include <QTemporaryFile>
using namespace Utils;
namespace MesonProjectManager {
namespace Internal {
// ToolWrapper base
ToolWrapper::ToolWrapper(const QString &name, const Utils::FilePath &path, bool autoDetected)
: m_version(read_version(path))
, m_isValid{path.exists() && m_version.isValid}
@@ -49,9 +60,8 @@ Version ToolWrapper::read_version(const Utils::FilePath &toolPath)
return {};
}
std::optional<Utils::FilePath> ToolWrapper::findTool(const QStringList &exeNames)
static std::optional<FilePath> findTool(const QStringList &exeNames)
{
using namespace Utils;
Environment systemEnvironment = Environment::systemEnvironment();
for (const auto &exe : exeNames) {
const FilePath exe_path = systemEnvironment.searchInPath(exe);
@@ -61,5 +71,118 @@ std::optional<Utils::FilePath> ToolWrapper::findTool(const QStringList &exeNames
return std::nullopt;
}
// MesonWrapper
template<typename First>
void impl_option_cat(QStringList &list, const First &first)
{
list.append(first);
}
template<typename First, typename... T>
void impl_option_cat(QStringList &list, const First &first, const T &...args)
{
impl_option_cat(list, first);
impl_option_cat(list, args...);
}
template<typename... T>
QStringList options_cat(const T &...args)
{
QStringList result;
impl_option_cat(result, args...);
return result;
}
Command MesonWrapper::setup(const Utils::FilePath &sourceDirectory,
const Utils::FilePath &buildDirectory,
const QStringList &options) const
{
return {m_exe,
sourceDirectory,
options_cat("setup", options, sourceDirectory.toString(), buildDirectory.toString())};
}
Command MesonWrapper::configure(const Utils::FilePath &sourceDirectory,
const Utils::FilePath &buildDirectory,
const QStringList &options) const
{
if (!isSetup(buildDirectory))
return setup(sourceDirectory, buildDirectory, options);
return {m_exe, buildDirectory, options_cat("configure", options, buildDirectory.toString())};
}
Command MesonWrapper::regenerate(const Utils::FilePath &sourceDirectory,
const Utils::FilePath &buildDirectory) const
{
return {m_exe,
buildDirectory,
options_cat("--internal",
"regenerate",
sourceDirectory.toString(),
buildDirectory.toString(),
"--backend",
"ninja")};
}
Command MesonWrapper::introspect(const Utils::FilePath &sourceDirectory) const
{
return {m_exe,
sourceDirectory,
{"introspect", "--all", QString("%1/meson.build").arg(sourceDirectory.toString())}};
}
std::optional<FilePath> MesonWrapper::find()
{
return findTool({"meson.py", "meson"});
}
template<typename File_t>
bool containsFiles(const QString &path, const File_t &file)
{
return QFileInfo::exists(QString("%1/%2").arg(path).arg(file));
}
template<typename File_t, typename... T>
bool containsFiles(const QString &path, const File_t &file, const T &...files)
{
return containsFiles(path, file) && containsFiles(path, files...);
}
bool run_meson(const Command &command, QIODevice *output)
{
Utils::Process process;
process.setWorkingDirectory(command.workDir());
process.setCommand(command.cmdLine());
process.start();
if (!process.waitForFinished())
return false;
if (output) {
output->write(process.rawStdOut());
}
return process.exitCode() == 0;
}
bool isSetup(const Utils::FilePath &buildPath)
{
using namespace Utils;
return containsFiles(buildPath.pathAppended(Constants::MESON_INFO_DIR).toString(),
Constants::MESON_INTRO_TESTS,
Constants::MESON_INTRO_TARGETS,
Constants::MESON_INTRO_INSTALLED,
Constants::MESON_INTRO_BENCHMARKS,
Constants::MESON_INTRO_BUIDOPTIONS,
Constants::MESON_INTRO_PROJECTINFO,
Constants::MESON_INTRO_DEPENDENCIES,
Constants::MESON_INTRO_BUILDSYSTEM_FILES);
}
// NinjaWrapper
std::optional<FilePath> NinjaWrapper::find()
{
return findTool({"ninja", "ninja-build"});
}
} // namespace Internal
} // namespace MesonProjectManager