From e7975d79a28b8aa6d1f8c840cca0c6973b95a0de Mon Sep 17 00:00:00 2001 From: tfuxu <73042332+tfuxu@users.noreply.github.com> Date: Fri, 11 Nov 2022 01:42:00 +0100 Subject: [PATCH] meson: remove depracation warnings in newer Meson versions --- Makefile | 10 +++++----- meson.build | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 7b38fd4e..c66db922 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,16 @@ install: - sudo meson builddir --prefix=/usr/local --wipe + sudo meson setup builddir --prefix=/usr/local --wipe sudo ninja -C builddir install global: - sudo meson builddir --prefix=/usr --wipe + sudo meson setup builddir --prefix=/usr --wipe sudo ninja -C builddir install release: - sudo meson builddir --prefix=/usr --Dbuildtype=release --wipe + sudo meson setup builddir --prefix=/usr --Dbuildtype=release --wipe sudo ninja -C builddir install - + user: - meson builddir --prefix="$(shell pwd)/builddir" --buildtype=debug --wipe + meson setup builddir --prefix="$(shell pwd)/builddir" --buildtype=debug --wipe ninja -C builddir install ninja -C builddir run diff --git a/meson.build b/meson.build index 53d44828..6996c013 100644 --- a/meson.build +++ b/meson.build @@ -22,7 +22,7 @@ PROJECT_RDNN_NAME = 'com.github.GradienceTeam.Gradience' # Set APPLICATION_ID and VERSION_SUFFIX if get_option('buildtype') == 'debug' - VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() + VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD', check: true).stdout().strip() if VCS_TAG == '' VERSION_SUFFIX = '-devel' else