Meson build: Add install_tag keyword argument

kjellahl · kjellahl · commit 8787f42216a3 · 2025-02-12T16:32:51.000+01:00
Require meson &gt;= 0.60. Remove the can_add_dist_script variable.
It's unnecessary when the meson version &gt;= 0.58.
Simplify the calls to dependency().get_variable().
diff --git a/MSVC_NMake/meson.build b/MSVC_NMake/meson.build
@@ -1,7 +1,6 @@
 # MSVC_NMake
 
-# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3,
-#        can_add_dist_script
+# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3
 # Output: sigc_rc
 
 sigc_rc = configure_file(
@@ -20,13 +19,11 @@ configure_file(
 untracked_msvc_nmake = 'untracked' / 'MSVC_NMake'
 handle_built_files = project_source_root / 'tools' / 'handle-built-files.py'
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, handle_built_files, 'dist_gen_msvc_files',
-    meson.current_build_dir(),
-    untracked_msvc_nmake,
-    project_build_root / 'sigc++config.h',
-    meson.current_build_dir() / 'sigc.rc',
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, handle_built_files, 'dist_gen_msvc_files',
+  meson.current_build_dir(),
+  untracked_msvc_nmake,
+  project_build_root / 'sigc++config.h',
+  meson.current_build_dir() / 'sigc.rc',
+)
diff --git a/docs/manual/meson.build b/docs/manual/meson.build
@@ -1,7 +1,7 @@
 # docs/manual
 
 # input: install_datadir, sigcxx_pcname, tutorial_custom_cmd, python3,
-#        build_documentation, install_docdir, can_add_dist_script, xsltproc
+#        build_documentation, install_docdir, xsltproc
 # output: can_parse_and_validate, build_pdf_by_default, can_build_pdf,
 #         install_tutorialdir, build_manual_opt, build_manual
 
@@ -45,10 +45,15 @@ if xmllint.found()
   endif
 endif
 
-install_data('..' / 'index.html', install_dir: install_docdir)
+install_data('..' / 'index.html',
+  install_dir: install_docdir,
+  install_tag: 'doc',
+)
 install_data('..' / 'images' / 'libsigc_logo.gif',
              '..' / 'images' / 'top.gif',
-             install_dir: install_docdir / 'images')
+  install_dir: install_docdir / 'images',
+  install_tag: 'doc',
+)
 
 doc_dist_dir = 'untracked' / 'docs' / 'manual' # Relative to MESON_DIST_ROOT
 
@@ -66,7 +71,8 @@ custom_target('manual_html',
   ],
   build_by_default: true,
   install: true,
-  install_dir: install_tutorialdir
+  install_dir: install_tutorialdir,
+  install_tag: 'doc',
 )
 
 if can_parse_and_validate
@@ -100,13 +106,11 @@ if can_build_pdf
   )
 endif
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, tutorial_custom_cmd, 'dist_doc',
-    doc_dist_dir,
-    meson.current_build_dir(),
-    meson.current_source_dir() / sigc_manual_xml,
-    meson.current_build_dir() / sigc_manual_pdf,
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, tutorial_custom_cmd, 'dist_doc',
+  doc_dist_dir,
+  meson.current_build_dir(),
+  meson.current_source_dir() / sigc_manual_xml,
+  meson.current_build_dir() / sigc_manual_pdf,
+)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
@@ -3,7 +3,7 @@
 # Input: built_files_root, project_source_root, sigcxx_pcname,
 #        sigcxx_api_version, build_documentation, source_h_files,
 #        built_h_files, install_datadir, python3, doc_reference,
-#        built_h_file_targets, can_add_dist_script, dot
+#        built_h_file_targets, dot
 # Output: install_docdir, install_devhelpdir, if build_documentation: tag_file
 
 tag_file_modules = [
@@ -15,7 +15,7 @@ docinstall_flags = []
 foreach module : tag_file_modules
   depmod = dependency(module, required: false)
   if depmod.found()
-    doxytagfile = depmod.get_variable(pkgconfig: 'doxytagfile', internal: 'doxytagfile', default_value: '')
+    doxytagfile = depmod.get_variable('doxytagfile', default_value: '')
     if doxytagfile != ''
       if depmod.type_name() == 'internal'
         # Subprojects must build their tag files before doxygen is called.
@@ -25,8 +25,8 @@ foreach module : tag_file_modules
           doxygen_tag_targets += subproject(module).get_variable('global_tag_file_target')
         endif
       endif
-      htmlrefpub = depmod.get_variable(pkgconfig: 'htmlrefpub', internal: 'htmlrefpub', default_value: '')
-      htmlrefdir = depmod.get_variable(pkgconfig: 'htmlrefdir', internal: 'htmlrefdir', default_value: '')
+      htmlrefpub = depmod.get_variable('htmlrefpub', default_value: '')
+      htmlrefdir = depmod.get_variable('htmlrefdir', default_value: '')
       if htmlrefpub == ''
         htmlrefpub = htmlrefdir
       elif htmlrefdir == ''
@@ -110,6 +110,7 @@ if built_h_file_targets.length() > 0
     build_by_default: build_documentation,
     install: true,
     install_dir: install_reference_docdir,
+    install_tag: 'doc',
   )
 else
   # All .h files are stored in the source tree (not maintainer mode).
@@ -127,6 +128,7 @@ else
     build_by_default: build_documentation,
     install: true,
     install_dir: install_reference_docdir,
+    install_tag: 'doc',
   )
 endif
 
@@ -151,17 +153,16 @@ meson.add_install_script(
   devhelp_file.full_path(),
   install_devhelpdir,
   install_reference_docdir / 'html',
-  docinstall_flags
+  docinstall_flags,
+  install_tag: 'doc',
 )
 
-if can_add_dist_script
-  # Distribute built files and files copied by mm-common-get.
-  meson.add_dist_script(
-    python3, doc_reference, 'dist_doc',
-    doctool_dir,
-    doctool_dist_dir,
-    meson.current_build_dir(),
-    tag_file.full_path(),
-    devhelp_file.full_path(),
-  )
-endif
+# Distribute built files and files copied by mm-common-get.
+meson.add_dist_script(
+  python3, doc_reference, 'dist_doc',
+  doctool_dir,
+  doctool_dist_dir,
+  meson.current_build_dir(),
+  tag_file.full_path(),
+  devhelp_file.full_path(),
+)
diff --git a/examples/meson.build b/examples/meson.build
@@ -23,6 +23,7 @@ foreach ex : examples
     cpp_args: '-DSIGCXX_DISABLE_DEPRECATED=1',
     dependencies: sigcxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: build_examples
+    build_by_default: build_examples,
+    install: false,
   )
 endforeach
diff --git a/meson.build b/meson.build
@@ -7,8 +7,7 @@ project('libsigc++', 'cpp',
     'cpp_std=c++11',
     'warning_level=1',
   ],
-  meson_version: '>= 0.55.0', # required for meson.add_dist_script(python3, ...)
-                              # and meson.add_install_script(python3, ...)
+  meson_version: '>= 0.60.0', # required for install_tag keyword argument.
 )
 
 sigcxx_api_version = '2.0'
@@ -34,10 +33,9 @@ sigcxx_libversion = '@0@.@1@.@2@'.format(
   libtool_soversion[1])
 darwin_versions = [libtool_soversion[0] + 1, '@0@.@1@'.format(libtool_soversion[0] + 1, libtool_soversion[1])]
 
-# Use these instead of meson.source_root() and meson.build_root() in subdirectories.
-# source_root() and build_root() are not useful, if this is a subproject.
-project_source_root = meson.current_source_dir()
-project_build_root = meson.current_build_dir()
+# Source and build root directories of the current (sub)project.
+project_source_root = meson.project_source_root()
+project_build_root = meson.project_build_root()
 
 cpp_compiler = meson.get_compiler('cpp')
 is_msvc = cpp_compiler.get_id() == 'msvc'
@@ -260,13 +258,16 @@ configure_file(
   input: 'sigc++.pc.in',
   output: sigcxx_pcname + '.pc',
   configuration: pkg_conf_data,
+  install: true,
   install_dir: install_pkgconfigdir,
+  install_tag: 'devel',
 )
 
 configure_file(
   input: 'sigc++-uninstalled.pc.in',
   output: sigcxx_pcname + '-uninstalled.pc',
   configuration: pkg_conf_data,
+  install: false,
 )
 
 sigcxxconfig_h_meson = files('sigc++config.h.meson')
@@ -275,33 +276,30 @@ configure_file(
   input: sigcxxconfig_h_meson,
   output: 'sigc++config.h',
   configuration: pkg_conf_data,
+  install: true,
   install_dir: install_includeconfigdir,
+  install_tag: 'devel',
 )
 
-# add_dist_script() is not allowed in a subproject if meson.version() < 0.58.0.
-can_add_dist_script = not meson.is_subproject() or meson.version().version_compare('>= 0.58.0')
-
 subdir('MSVC_NMake')
 subdir('sigc++')
 subdir('examples')
 subdir('tests')
 subdir('docs/reference')
 subdir('docs/manual')
 
-if can_add_dist_script
-  # Add a ChangeLog file to the distribution directory.
-  meson.add_dist_script(
-    python3, dist_changelog,
-    project_source_root,
-  )
-  # Add build scripts to the distribution directory, and delete .gitignore
-  # files and an empty $MESON_PROJECT_DIST_ROOT/build/ directory.
-  meson.add_dist_script(
-    python3, dist_build_scripts,
-    project_source_root,
-    'untracked' / 'build_scripts',
-  )
-endif
+# Add a ChangeLog file to the distribution directory.
+meson.add_dist_script(
+  python3, dist_changelog,
+  project_source_root,
+)
+# Add build scripts to the distribution directory, and delete .gitignore
+# files and an empty $MESON_PROJECT_DIST_ROOT/build/ directory.
+meson.add_dist_script(
+  python3, dist_build_scripts,
+  project_source_root,
+  'untracked' / 'build_scripts',
+)
 
 if meson.is_subproject()
   pkgconfig_vars = {
diff --git a/sigc++/meson.build b/sigc++/meson.build
@@ -2,7 +2,7 @@
 
 # Input: sigcxx_build_dep, sigcxx_pcname, sigcxx_libversion, sigcxx_api_version,
 #        install_includedir, project_source_root, sigc_res, python3,
-#        handle_built_files, maintainer_mode, can_add_dist_script
+#        handle_built_files, maintainer_mode
 # Output: source_h_files, built_h_files, sigcxx_own_dep, built_files_root,
 #         built_h_file_targets
 
@@ -174,17 +174,16 @@ meson.add_install_script(
   built_h_cc_dir,
   install_includedir / sigcxx_pcname / 'sigc++', # subdir below {prefix}
   built_h_files,
+  install_tag: 'devel',
 )
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, handle_built_files, 'dist_built_files',
-    built_h_cc_dir,
-    untracked_sigcxx,
-    built_h_files + built_cc_files,
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, handle_built_files, 'dist_built_files',
+  built_h_cc_dir,
+  untracked_sigcxx,
+  built_h_files + built_cc_files,
+)
 
 # This is used when building example programs and test programs.
 # It's also a part of sigcxx_dep, when libsigc++ is a subproject.
diff --git a/tests/meson.build b/tests/meson.build
@@ -60,6 +60,7 @@ foreach ex : test_programs
     dependencies: sigcxx_own_dep,
     implicit_include_directories: false,
     build_by_default: build_tests,
+    install: false,
   )
 
   # If exe_file is a test program, it is built by default unconditionally.
@@ -83,7 +84,8 @@ if can_benchmark
     exe_file = executable(ex_name, ex_sources,
       dependencies: [sigcxx_own_dep, benchmark_dep],
       implicit_include_directories: false,
-      build_by_default: do_benchmark
+      build_by_default: do_benchmark,
+      install: false,
     )
 
     if do_benchmark

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ foreach ex : examples`
`23`	`23`	`cpp_args: '-DSIGCXX_DISABLE_DEPRECATED=1',`
`24`	`24`	`dependencies: sigcxx_own_dep,`
`25`	`25`	`implicit_include_directories: false,`
`26`		`- build_by_default: build_examples`
	`26`	`+ build_by_default: build_examples,`
	`27`	`+ install: false,`
`27`	`28`	`)`
`28`	`29`	`endforeach`