[glib/meson-bump: 34/35] build: Remove unsupported `install` directives

[Emmanuele Bassi <ebassi src gnome org>]

commit 89ef1d2828045a03762691392c6b2a344ee3a1f2
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Jun 17 16:52:36 2019 +0100

    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.

 gio/gdbus-2.0/codegen/meson.build |  3 ---
 gio/meson.build                   |  2 +-
 gio/tests/meson.build             | 23 +++++++++++++++--------
 glib/meson.build                  |  5 ++---
 gobject/meson.build               |  5 ++---
 meson.build                       |  1 -
 6 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 24d2527bc..121e9e6bb 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -16,7 +16,6 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
 # Install gdbus-codegen executable
 gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
   output : 'gdbus-codegen',
-  install : true,
   install_dir : get_option('bindir'),
   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 += configure_file(input : 'config.py.in',
                                             output : 'config.py',
-                                            install : true,
                                             install_dir : codegen_dir,
                                             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
   # and then install it too so that it can be used after installation
   gdbus_codegen_built_files += configure_file(input : f, output : f,
-                                              install : true,
                                               install_dir : codegen_dir,
                                               copy : true)
 endforeach
diff --git a/gio/meson.build b/gio/meson.build
index b17ab8148..987d0f4c6 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -996,7 +996,7 @@ if enable_systemtap
     output : '@0@.stp'.format(libgio.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 subdir('fam')
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index a0c09444b..9f5ea1cdb 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -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,
diff --git a/glib/meson.build b/glib/meson.build
index 40b58047d..2bd3d8226 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -1,5 +1,4 @@
 configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
-  install : true,
   install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
   configuration : glibconfig_conf)
 
@@ -456,11 +455,11 @@ if enable_systemtap
     output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 # Don’t 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())
 if build_tests
   subdir('tests')
-endif
\ No newline at end of file
+endif
diff --git a/gobject/meson.build b/gobject/meson.build
index 81dcffda5..c7805c556 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -75,7 +75,6 @@ foreach tool: python_tools
     input : tool + '.in',
     output : tool,
     configuration : python_tools_conf,
-    install : true,
     install_dir : glib_bindir,
   )
 
@@ -163,11 +162,11 @@ if enable_systemtap
     output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 # Don’t 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())
 if build_tests
   subdir('tests')
-endif
\ No newline at end of file
+endif
diff --git a/meson.build b/meson.build
index b85ff7661..2b8b890cf 100644
--- a/meson.build
+++ b/meson.build
@@ -2068,7 +2068,6 @@ if have_sh
   gettextize_conf.set('datarootdir', glib_datadir)
   gettextize_conf.set('datadir', glib_datadir)
   configure_file(input : 'glib-gettextize.in',
-    install : true,
     install_dir : glib_bindir,
     output : 'glib-gettextize',
     configuration : gettextize_conf)