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

@ -16,7 +16,6 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
# Install gdbus-codegen executable # Install gdbus-codegen executable
gdbus_codegen = configure_file(input : 'gdbus-codegen.in', gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
output : 'gdbus-codegen', output : 'gdbus-codegen',
install : true,
install_dir : get_option('bindir'), install_dir : get_option('bindir'),
configuration : gdbus_codegen_conf configuration : gdbus_codegen_conf
) )
@ -28,7 +27,6 @@ codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')
gdbus_codegen_built_files = [] gdbus_codegen_built_files = []
gdbus_codegen_built_files += configure_file(input : 'config.py.in', gdbus_codegen_built_files += configure_file(input : 'config.py.in',
output : 'config.py', output : 'config.py',
install : true,
install_dir : codegen_dir, install_dir : codegen_dir,
configuration : gdbus_codegen_conf) configuration : gdbus_codegen_conf)
@ -36,7 +34,6 @@ foreach f : gdbus_codegen_files
# Copy these into the builddir so that gdbus-codegen can be used uninstalled # Copy these into the builddir so that gdbus-codegen can be used uninstalled
# and then install it too so that it can be used after installation # and then install it too so that it can be used after installation
gdbus_codegen_built_files += configure_file(input : f, output : f, gdbus_codegen_built_files += configure_file(input : f, output : f,
install : true,
install_dir : codegen_dir, install_dir : codegen_dir,
copy : true) copy : true)
endforeach endforeach

View File

@ -996,7 +996,7 @@ if enable_systemtap
output : '@0@.stp'.format(libgio.full_path().split('/').get(-1)), output : '@0@.stp'.format(libgio.full_path().split('/').get(-1)),
configuration : stp_cdata, configuration : stp_cdata,
install_dir : tapset_install_dir, install_dir : tapset_install_dir,
install : true) )
endif endif
subdir('fam') subdir('fam')

View File

@ -424,13 +424,20 @@ else
endif endif
foreach appinfo_test_desktop_file : appinfo_test_desktop_files foreach appinfo_test_desktop_file : appinfo_test_desktop_files
configure_file( if installed_tests_enabled
input: appinfo_test_desktop_file + '.in', configure_file(
output: appinfo_test_desktop_file, input: appinfo_test_desktop_file + '.in',
install_dir: installed_tests_execdir, output: appinfo_test_desktop_file,
install: installed_tests_enabled, install_dir: installed_tests_execdir,
configuration: cdata, configuration: cdata,
) )
else
configure_file(
input: appinfo_test_desktop_file + '.in',
output: appinfo_test_desktop_file,
configuration: cdata,
)
endif
endforeach endforeach
if installed_tests_enabled 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', test_generated_txt = configure_file(input : 'test1.txt',
output : 'test-generated.txt', output : 'test-generated.txt',
copy : true, copy : true,
install : false) )
resources_extra_sources = [ resources_extra_sources = [
test_gresource, test_gresource,

View File

@ -1,5 +1,4 @@
configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h', configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
install : true,
install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'), install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
configuration : glibconfig_conf) configuration : glibconfig_conf)
@ -456,11 +455,11 @@ if enable_systemtap
output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)), output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)),
configuration : stp_cdata, configuration : stp_cdata,
install_dir : tapset_install_dir, install_dir : tapset_install_dir,
install : true) )
endif endif
# Dont build the tests unless we can run them (either natively or in an exe wrapper) # Dont build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif

View File

@ -75,7 +75,6 @@ foreach tool: python_tools
input : tool + '.in', input : tool + '.in',
output : tool, output : tool,
configuration : python_tools_conf, configuration : python_tools_conf,
install : true,
install_dir : glib_bindir, install_dir : glib_bindir,
) )
@ -163,11 +162,11 @@ if enable_systemtap
output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)), output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)),
configuration : stp_cdata, configuration : stp_cdata,
install_dir : tapset_install_dir, install_dir : tapset_install_dir,
install : true) )
endif endif
# Dont build the tests unless we can run them (either natively or in an exe wrapper) # Dont build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests if build_tests
subdir('tests') subdir('tests')
endif endif

View File

@ -2068,7 +2068,6 @@ if have_sh
gettextize_conf.set('datarootdir', glib_datadir) gettextize_conf.set('datarootdir', glib_datadir)
gettextize_conf.set('datadir', glib_datadir) gettextize_conf.set('datadir', glib_datadir)
configure_file(input : 'glib-gettextize.in', configure_file(input : 'glib-gettextize.in',
install : true,
install_dir : glib_bindir, install_dir : glib_bindir,
output : 'glib-gettextize', output : 'glib-gettextize',
configuration : gettextize_conf) configuration : gettextize_conf)