build: Remove unsupported install directives

We're using the `install` argument for configure_file() all over the
place.

The support for an `install` argument for configure_file() was added in
Meson 0.50, but we haven't bumped the minimum version of Meson we
require, yet; which means we're getting compatibility warnings when
using recent versions of Meson, and undefined behaviour when using older
versions.

The configure_file() object defaults to `install: false`, unless an
install directory is used. This means that all instances of an `install`
argument with an explicit `true` or `false` value can be removed,
whereas all instances of `install` with a value determined from a
configuration option must be turned into an explicit conditional.
This commit is contained in:
Emmanuele Bassi
2019-06-17 16:52:36 +01:00
parent 3f1a79a4fa
commit 00d7568e4f
6 changed files with 20 additions and 19 deletions

View File

@@ -424,13 +424,20 @@ else
endif
foreach appinfo_test_desktop_file : appinfo_test_desktop_files
configure_file(
input: appinfo_test_desktop_file + '.in',
output: appinfo_test_desktop_file,
install_dir: installed_tests_execdir,
install: installed_tests_enabled,
configuration: cdata,
)
if installed_tests_enabled
configure_file(
input: appinfo_test_desktop_file + '.in',
output: appinfo_test_desktop_file,
install_dir: installed_tests_execdir,
configuration: cdata,
)
else
configure_file(
input: appinfo_test_desktop_file + '.in',
output: appinfo_test_desktop_file,
configuration: cdata,
)
endif
endforeach
if installed_tests_enabled
@@ -558,7 +565,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_generated_txt = configure_file(input : 'test1.txt',
output : 'test-generated.txt',
copy : true,
install : false)
)
resources_extra_sources = [
test_gresource,