From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 8 May 2023 13:03:24 +0000 (+0200)
Subject: mkosi.build: print important build commands
X-Git-Tag: v254-rc1~540^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F27569%2Fhead;p=thirdparty%2Fsystemd.git

mkosi.build: print important build commands

This undoes the effect of 1394a3ec351048bae008627a0775d1f9a6c46294 partially.
We print the fairly verbose output of the build commands, so let's also
print the commands themselves. This makes it much easier to understand what
is going on.

(The style was copied from other scripts where we do 'set -x' for one command.)
---

diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/00-base/mkosi.build
index 4b6cff662fd..5db96006fe5 100755
--- a/mkosi.presets/00-base/mkosi.build
+++ b/mkosi.presets/00-base/mkosi.build
@@ -174,10 +174,10 @@ if [ ! -f "$BUILDDIR"/build.ninja ]; then
         )
     fi
 
-    meson setup "$BUILDDIR" "${CONFIGURE_OPTS[@]}"
+    ( set -x; meson setup "$BUILDDIR" "${CONFIGURE_OPTS[@]}" )
 fi
 
-ninja -C "$BUILDDIR" "$@"
+( set -x; ninja -C "$BUILDDIR" "$@" )
 if [ "$WITH_TESTS" = 1 ]; then
     if [ -n "$SANITIZERS" ]; then
         export ASAN_OPTIONS="$MKOSI_ASAN_OPTIONS"
@@ -187,7 +187,7 @@ if [ "$WITH_TESTS" = 1 ]; then
         TIMEOUT_MULTIPLIER=1
     fi
 
-    meson test -C "$BUILDDIR" --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER
+    ( set -x; meson test -C "$BUILDDIR" --print-errorlogs --timeout-multiplier=$TIMEOUT_MULTIPLIER )
 fi
 
-meson install -C "$BUILDDIR" --quiet --no-rebuild --only-changed
+( set -x; meson install -C "$BUILDDIR" --quiet --no-rebuild --only-changed )