Commit 2cc63809 authored by Rasmus Thomsen's avatar Rasmus Thomsen

newapkbuild: invoke meson directly for build/test/install instead of ninja

This has multiple advantages:
* It's tool agnostic (e.g. if we were to drop the ninja symlink
  for samu, we wouldn't have to change anything here)
* It allows for more fine grained control, e.g. in meson test,
  where we can increase timeouts and print the test log to stdout,
  something which we can't control when invoking it via ninja.
* We can pass --no-rebuild to test and install, so ninja doesn't
  have to check if anything has to be rebuild against in the test
  and install phase, when we built everything in the build phase
  already

This is similiar to dd24cdf8, but
for meson.
parent 60617455
......@@ -85,7 +85,7 @@ build_meson() {
--localstatedir=/var \\
--buildtype=plain \\
. output
ninja -C output
meson compile ${JOBS:+-j ${JOBS}} -C output
__EOF__
}
......@@ -144,7 +144,7 @@ __EOF__
check_meson() {
cat >>APKBUILD<<__EOF__
ninja -C output test
meson test --no-rebuild -v -C output
__EOF__
}
......@@ -173,7 +173,7 @@ package_autotools() {
package_meson() {
cat >>APKBUILD<<__EOF__
DESTDIR="\$pkgdir" ninja -C output install
DESTDIR="\$pkgdir" meson install --no-rebuild -C output
__EOF__
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment