[gjs: 1/2] Revert "build: disable gir install via list to pacify meson >= 0.60.2"
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 1/2] Revert "build: disable gir install via list to pacify meson >= 0.60.2"
- Date: Wed, 12 Jan 2022 00:10:06 +0000 (UTC)
commit 5e4d9c79d3730d7e95d2010c7f00da1211e58a93
Author: Eli Schwartz <eschwartz archlinux org>
Date: Tue Jan 11 18:40:52 2022 -0500
Revert "build: disable gir install via list to pacify meson >= 0.60.2"
This reverts commit 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19.
This commit was wrong, because it tried to work around a bug in a single
version of meson by using something that isn't, wasn't, and won't be a
valid value.
The fixed version of meson 0.60.x has been out for a while now, which
once again accepts `false`, and 0.61.0 also accepts `false` but was
known at the time of this workaround to not work in meson-git master
(now meson 0.61.0).
Using `false` is acceptable and the failure to accept it has been
qualified as a meson regression. Using `[false]` is just... trying to
fuzz meson with random objects until you get something that slips its
way through the argument checker and produces desired effects on the
python implementation level.
installed-tests/js/libgjstesttools/meson.build | 2 +-
installed-tests/js/meson.build | 6 +++---
meson.build | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build
index 3ca4d7ed..2e57483a 100644
--- a/installed-tests/js/libgjstesttools/meson.build
+++ b/installed-tests/js/libgjstesttools/meson.build
@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools,
includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources,
namespace: 'GjsTestTools', nsversion: '1.0',
symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error',
- install: get_option('installed_tests'), install_dir_gir: [false],
+ install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
gjstest_tools_typelib = gjstest_tools_gir[1]
libgjstesttools_dep = declare_dependency(
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 16b59660..2f007351 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
sources: regress_sources, namespace: 'Regress', nsversion: '1.0',
identifier_prefix: 'Regress', symbol_prefix: 'regress_',
extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
- install: get_option('installed_tests'), install_dir_gir: [false],
+ install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
regress_typelib = regress_gir[1]
@@ -91,7 +91,7 @@ if not skip_warnlib
warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
symbol_prefix: 'warnlib_', header: 'warnlib.h',
- install: get_option('installed_tests'), install_dir_gir: [false],
+ install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
warnlib_typelib = warnlib_gir[1]
endif
@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
includes: ['Gio-2.0'], sources: gimarshallingtests_sources,
namespace: 'GIMarshallingTests', nsversion: '1.0',
symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
- install: get_option('installed_tests'), install_dir_gir: [false],
+ install: get_option('installed_tests'), install_dir_gir: false,
install_dir_typelib: installed_tests_execdir)
gimarshallingtests_typelib = gimarshallingtests_gir[1]
diff --git a/meson.build b/meson.build
index 73d0eaca..437b3fd3 100644
--- a/meson.build
+++ b/meson.build
@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs,
includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources,
namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs',
symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true,
- install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0')
+ install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0')
gjs_private_typelib = gjs_private_gir[1]
### Build gjs-console interpreter ##############################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]