From 3831932228c2271d722ac9785f2dc4a6c8d88686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= Date: Thu, 9 Sep 2021 23:51:46 +0200 Subject: build: Make use of dictionaries meson gained the dictionaries as builtin objects[0] that can be modified with the addition operator[1] and can be useful when setting configuration or even environment values[2]. The individual object creation has been replaced by dictionaries when possible. [0] http://mesonbuild.com/Release-notes-for-0-47-0.html#new-builtin-object-type-dictionary [1] https://mesonbuild.com/Release-notes-for-0-48-0.html#dictionary-addition [2] https://mesonbuild.com/Release-notes-for-0-52-0.html#support-taking-environment-values-from-a-dictionary --- docs/reference/libqmi-glib/xml/meson.build | 17 +++++++++-------- meson.build | 9 +++++---- src/libqmi-glib/test/meson.build | 6 ++++-- src/qmi-firmware-update/test/meson.build | 6 ++++-- src/qmicli/test/meson.build | 6 ++++-- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/docs/reference/libqmi-glib/xml/meson.build b/docs/reference/libqmi-glib/xml/meson.build index 0987c098..51b44752 100644 --- a/docs/reference/libqmi-glib/xml/meson.build +++ b/docs/reference/libqmi-glib/xml/meson.build @@ -1,14 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2019 - 2021 Iñigo Martinez -ent_conf = configuration_data() -ent_conf.set('PACKAGE', meson.project_name()) -ent_conf.set('PACKAGE_BUGREPORT', meson.project_name() + '-devel@lists.freedesktop.org') -ent_conf.set('PACKAGE_NAME', meson.project_name()) -ent_conf.set('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), qmi_version)) -ent_conf.set('PACKAGE_TARNAME', meson.project_name()) -ent_conf.set('PACKAGE_URL', '') -ent_conf.set('PACKAGE_VERSION', qmi_version) +ent_conf = { + 'PACKAGE': meson.project_name(), + 'PACKAGE_BUGREPORT': meson.project_name() + '-devel@lists.freedesktop.org', + 'PACKAGE_NAME': meson.project_name(), + 'PACKAGE_STRING': '@0@ @1@'.format(meson.project_name(), qmi_version), + 'PACKAGE_TARNAME': meson.project_name(), + 'PACKAGE_URL': '', + 'PACKAGE_VERSION': qmi_version, +} gtkdocentities_ent = configure_file( input: 'gtkdocentities.ent.in', diff --git a/meson.build b/meson.build index bbe753de..9cee511a 100644 --- a/meson.build +++ b/meson.build @@ -225,10 +225,11 @@ endif random_number = qmi_minor_version + meson.version().split('.').get(1).to_int() -test_env = environment() -test_env.set('G_DEBUG', 'gc-friendly') -test_env.set('MALLOC_CHECK_', '2') -test_env.set('MALLOC_PERTURB_', (random_number % 256).to_string()) +test_env = { + 'G_DEBUG': 'gc-friendly', + 'MALLOC_CHECK_': '2', + 'MALLOC_PERTURB_': (random_number % 256).to_string(), +} subdir('src') subdir('utils') diff --git a/src/libqmi-glib/test/meson.build b/src/libqmi-glib/test/meson.build index 12e0312b..ac3e2837 100644 --- a/src/libqmi-glib/test/meson.build +++ b/src/libqmi-glib/test/meson.build @@ -20,8 +20,10 @@ deps = [ test_units += [['test-generated', sources, deps]] -test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env += { + 'G_TEST_BUILDDIR': meson.current_build_dir(), + 'G_TEST_SRCDIR': meson.current_source_dir(), +} foreach test_unit: test_units exe = executable( diff --git a/src/qmi-firmware-update/test/meson.build b/src/qmi-firmware-update/test/meson.build index 32441888..e5da8312 100644 --- a/src/qmi-firmware-update/test/meson.build +++ b/src/qmi-firmware-update/test/meson.build @@ -6,8 +6,10 @@ test_units = [ ['test-firehose', libfirehose_dep], ] -test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env += { + 'G_TEST_BUILDDIR': meson.current_build_dir(), + 'G_TEST_SRCDIR': meson.current_source_dir(), +} foreach test_unit: test_units exe = executable( diff --git a/src/qmicli/test/meson.build b/src/qmicli/test/meson.build index f3d37e1d..b839b730 100644 --- a/src/qmicli/test/meson.build +++ b/src/qmicli/test/meson.build @@ -10,8 +10,10 @@ exe = executable( dependencies: libhelpers_dep, ) -test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env += { + 'G_TEST_BUILDDIR': meson.current_build_dir(), + 'G_TEST_SRCDIR': meson.current_source_dir(), +} test( test_unit, -- cgit v1.2.1