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