From a770d62b9be4306846b7e1d8c0c94968be175f58 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 19 May 2026 18:24:07 +0900 Subject: [PATCH] internal/rosa/package: migrate meson Signed-off-by: Ophestra --- internal/rosa/meson.go | 64 ++-------------------------------- internal/rosa/package/meson.az | 56 +++++++++++++++++++++++++++++ internal/rosa/state_native.go | 1 - 3 files changed, 58 insertions(+), 63 deletions(-) create mode 100644 internal/rosa/package/meson.az diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index 8f56ba81..737a727c 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -3,70 +3,10 @@ package rosa import ( "slices" "strings" - - "hakurei.app/internal/pkg" ) -func (t Toolchain) newMeson() (pkg.Artifact, string) { - const ( - version = "1.11.1" - checksum = "uvILRxdopwc6Dy17UbIeClcQr0qHqyTaqyk1M9OqWKN9PwB9N6UVAiyN8kSSz3r2" - ) - return t.NewPackage("meson", version, newFromGitHub( - "mesonbuild/meson", - version, - checksum, - ), &PackageAttr{ - Env: []string{ - "CMAKE_MAKE_PROGRAM=ninja", - }, - }, &PipHelper{ - EnterSource: true, - Check: ` -cd 'test cases' -rm -rf \ - 'common/32 has header' \ - 'common/66 vcstag' \ - 'common/153 wrap file should not failed' \ - 'common/184 openmp' \ - 'common/189 check header' \ - 'linuxlike/6 subdir include order' \ - 'linuxlike/9 compiler checks with dependencies' \ - 'linuxlike/13 cmake dependency' \ - 'frameworks/15 llvm' \ - 'frameworks/29 blocks' -cd .. - -python3 ./run_project_tests.py \ - -v \ - ` + jobsFlagE + ` \ - --failfast \ - --backend=ninja -`, - }, - PythonSetuptools, - PkgConfig, - CMake, - Ninja, - PythonPyTest, - ), version -} -func init() { - native.mustRegister(Toolchain.newMeson, &Metadata{ - Name: "meson", - Description: "an open source build system", - Website: "https://mesonbuild.com/", - - Dependencies: P{ - Python, - PkgConfig, - CMake, - Ninja, - }, - - ID: 6472, - }) -} +// Meson is the meson package used by [MesonHelper]. +var Meson = H("meson") // MesonHelper is the [Meson] build system helper. type MesonHelper struct { diff --git a/internal/rosa/package/meson.az b/internal/rosa/package/meson.az new file mode 100644 index 00000000..90ae9354 --- /dev/null +++ b/internal/rosa/package/meson.az @@ -0,0 +1,56 @@ +package meson { + description = "an open source build system"; + website = "https://mesonbuild.com"; + anitya = 6472; + + version* = "1.11.1"; + source = remoteGitHub { + suffix = "mesonbuild/meson"; + tag = version; + checksum = "uvILRxdopwc6Dy17UbIeClcQr0qHqyTaqyk1M9OqWKN9PwB9N6UVAiyN8kSSz3r2"; + }; + + env = [ + "CMAKE_MAKE_PROGRAM=ninja", + ]; + + exec = pip { + enterSource = true; + check = ` +cd 'test cases' +rm -rf \ + 'common/32 has header' \ + 'common/66 vcstag' \ + 'common/153 wrap file should not failed' \ + 'common/184 openmp' \ + 'common/189 check header' \ + 'linuxlike/6 subdir include order' \ + 'linuxlike/9 compiler checks with dependencies' \ + 'linuxlike/13 cmake dependency' \ + 'frameworks/15 llvm' \ + 'frameworks/29 blocks' +cd .. + +python3 ./run_project_tests.py \ + -v \ + ` + jobsFlagE + ` \ + --failfast \ + --backend=ninja +`; + }; + + inputs = [ + python-setuptools, + pkg-config, + cmake, + ninja, + python-pytest, + ]; + + runtime = [ + python, + pkg-config, + cmake, + ninja, + ]; +} diff --git a/internal/rosa/state_native.go b/internal/rosa/state_native.go index 0103193e..06b8fb38 100644 --- a/internal/rosa/state_native.go +++ b/internal/rosa/state_native.go @@ -104,7 +104,6 @@ var ( MPFR = H("mpfr") Make = H("make") Mesa = H("mesa") - Meson = H("meson") Mksh = H("mksh") MuslFts = H("musl-fts") MuslObstack = H("musl-obstack")