Merge branch 'install-tag' into 'main'

meson: Set install_tag on all tools

See merge request GNOME/glib!2882

gio/gdbus-2.0/codegen/meson.build

@@ -20,6 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
 gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
   output : 'gdbus-codegen',
   install_dir : get_option('bindir'),
+  install_tag : 'bin-devel',
   configuration : gdbus_codegen_conf
 )
   # Provide tools for others when we're a subproject and they use the Meson GNOME module

gio/meson.build

@@ -410,6 +410,7 @@ if host_system != 'windows'
       include_directories : glibinc,
       install : true,
       install_dir : multiarch_libexecdir,
+      install_tag : 'bin',
       c_args : gio_c_args,
       # intl.lib is not compatible with SAFESEH
       link_args : noseh_link_args)
@@ -959,6 +960,7 @@ gio_tool_sources = [
 
 executable('gio', gio_tool_sources,
   install : true,
+  install_tag : 'bin',
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
@@ -966,6 +968,7 @@ executable('gio', gio_tool_sources,
 
 executable('gresource', 'gresource-tool.c',
   install : true,
+  install_tag : 'bin',
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
   dependencies : [libelf, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@@ -973,6 +976,7 @@ executable('gresource', 'gresource-tool.c',
 gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
   install : true,
   install_dir : multiarch_bindir,
+  install_tag : 'bin',
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
@@ -982,6 +986,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
   ['glib-compile-schemas.c'],
   install : true,
   install_dir : multiarch_bindir,
+  install_tag : 'bin',
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
   dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep])
@@ -989,6 +994,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
 glib_compile_resources = executable('glib-compile-resources',
   [gconstructor_as_data_h, 'glib-compile-resources.c'],
   install : true,
+  install_tag : 'bin-devel',
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
@@ -1005,6 +1011,7 @@ endif
 
 executable('gsettings', 'gsettings-tool.c',
   install : true,
+  install_tag : 'bin',
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
@@ -1017,6 +1024,7 @@ install_data(['gschema.loc', 'gschema.its'],
 
 executable('gdbus', 'gdbus-tool.c',
   install : true,
+  install_tag : 'bin',
   c_args : gio_c_args,
   # intl.lib is not compatible with SAFESEH
   link_args : noseh_link_args,
@@ -1025,6 +1033,7 @@ executable('gdbus', 'gdbus-tool.c',
 if host_system != 'windows' and not glib_have_cocoa
   executable('gapplication', 'gapplication-tool.c',
     install : true,
+    install_tag : 'bin',
     c_args : gio_c_args,
     # intl.lib is not compatible with SAFESEH
     link_args : noseh_link_args,

glib/meson.build

@@ -435,6 +435,7 @@ if host_system == 'windows'
 else
   gtester = executable('gtester', 'gtester.c',
     install : true,
+    install_tag : 'bin-devel',
     c_args : ['-UG_DISABLE_ASSERT'],
     include_directories : configinc,
     dependencies : [libglib_dep])
@@ -447,6 +448,7 @@ configure_file(
   input: 'gtester-report.in',
   output: 'gtester-report',
   install_dir: get_option('bindir'),
+  install_tag : 'bin-devel',
   configuration: report_conf,
   install_mode: 'rwxr-xr-x'
 )

gobject/meson.build

@@ -80,6 +80,7 @@ foreach tool: python_tools
     output : tool,
     configuration : python_tools_conf,
     install_dir : glib_bindir,
+    install_tag : 'bin-devel',
   )
 
   # Set variables for later use
@@ -154,6 +155,7 @@ meson.override_dependency('gobject-2.0', libgobject_dep)
 
 executable('gobject-query', 'gobject-query.c',
   install : true,
+  install_tag : 'bin-devel',
   dependencies : [libglib_dep, libgobject_dep])
 
 install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))

tools/meson.build

@@ -9,6 +9,7 @@ if have_sh
   gettextize_conf.set('datadir', glib_datadir)
   configure_file(input : 'glib-gettextize.in',
     install_dir : glib_bindir,
+    install_tag : 'bin-devel',
     output : 'glib-gettextize',
     configuration : gettextize_conf)
 endif