1 From 78cde5e91ba5d9aa7bfe918ce6bad3b4af30c796 Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 14 Jan 2022 20:14:56 +0530
4 Subject: [PATCH] Revert "wp-uninstalled: build this script with the meson dirs
7 This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
9 Upstream-Status: Inappropriate[meson version dependent]
11 meson.build | 31 -------------------------------
12 wp-uninstalled.sh | 11 ++---------
13 2 files changed, 2 insertions(+), 40 deletions(-)
15 diff --git a/meson.build b/meson.build
16 index 1f9c9d8..7e02b29 100644
19 @@ -120,34 +120,3 @@ subdir('src')
20 if get_option('tests')
24 -conf_uninstalled = configuration_data()
25 -conf_uninstalled.set('MESON', '')
26 -conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
27 -conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
29 -wp_uninstalled = configure_file(
30 - input : 'wp-uninstalled.sh',
31 - output : 'wp-uninstalled.sh.in',
32 - configuration : conf_uninstalled,
35 -wireplumber_uninstalled = custom_target('wp-uninstalled',
36 - output : 'wp-uninstalled.sh',
37 - input : wp_uninstalled,
38 - build_by_default : true,
39 - command : ['cp', '@INPUT@', '@OUTPUT@'],
42 -if meson.version().version_compare('>= 0.58')
43 - builddir = meson.project_build_root()
44 - srcdir = meson.project_source_root()
46 - devenv = environment({
47 - 'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
48 - 'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
49 - 'WIREPLUMBER_DATA_DIR': srcdir / 'src',
52 - meson.add_devenv(devenv)
54 diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
55 index 79e53f2..d6279ff 100755
56 --- a/wp-uninstalled.sh
57 +++ b/wp-uninstalled.sh
62 -# This is unset by meson
63 -# shellcheck disable=SC2157
64 -if [ -z "@MESON@" ]; then
65 - SOURCEDIR="@MESON_SOURCE_ROOT@"
66 - BUILDDIR="@MESON_BUILD_ROOT@"
68 - SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
69 - BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
71 +SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
72 +BUILDDIR=${SOURCEDIR}/build
75 while getopts ":b:c:" opt; do