Meson build: Add install_tag keyword argument

kjellahl · kjellahl · commit 9ccd5188e524 · 2025-02-12T19:30:13.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/docs/manual/meson.build b/docs/manual/meson.build
@@ -1,7 +1,7 @@
 # docs/manual
 
 # input: install_datadir, xmlxx_pcname, tutorial_custom_cmd_py, python3,
-#        build_documentation, book_name, can_add_dist_script, xsltproc
+#        build_documentation, book_name, xsltproc
 # output: can_parse_and_validate, build_pdf_by_default, can_build_pdf,
 #         install_tutorialdir, build_manual_opt, build_manual
 
@@ -72,7 +72,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
@@ -106,13 +107,11 @@ if can_build_pdf
   )
 endif
 
-if can_add_dist_script
-  # Distribute built files.
-  meson.add_dist_script(
-    python3, tutorial_custom_cmd_py, 'dist_doc',
-    doc_dist_dir,
-    meson.current_build_dir(),
-    meson.current_build_dir() / 'libxml++.xml',
-    meson.current_build_dir() / 'libxml++.pdf',
-  )
-endif
+# Distribute built files.
+meson.add_dist_script(
+  python3, tutorial_custom_cmd_py, 'dist_doc',
+  doc_dist_dir,
+  meson.current_build_dir(),
+  meson.current_build_dir() / 'libxml++.xml',
+  meson.current_build_dir() / 'libxml++.pdf',
+)
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
@@ -2,7 +2,7 @@
 
 # Input: project_build_root, project_source_root, xmlxx_pcname,
 #        xmlxx_api_version, build_documentation, source_h_files,
-#        install_datadir, python3, doc_reference_py, can_add_dist_script, dot
+#        install_datadir, python3, doc_reference_py, dot
 # Output: install_docdir, install_devhelpdir, book_name,
 #         if build_documentation: tag_file
 
@@ -19,7 +19,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.
@@ -29,8 +29,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 == ''
@@ -104,6 +104,7 @@ tag_file = custom_target('html_and_tag',
   build_by_default: build_documentation,
   install: true,
   install_dir: install_reference_docdir,
+  install_tag: 'doc',
 )
 
 devhelp_file = custom_target('devhelp',
@@ -127,17 +128,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_py, '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_py, '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
@@ -39,7 +39,8 @@ foreach ex : example_programs
   exe_file = executable(ex_name, ex_sources,
     dependencies: xmlxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: build_examples
+    build_by_default: build_examples,
+    install: false,
   )
 
   if build_examples
diff --git a/meson.build b/meson.build
@@ -7,8 +7,7 @@ project('libxml++', '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.
 )
 
 xmlxx_api_version = '2.6'
@@ -38,10 +37,9 @@ macos_darwin_versions = [
   '@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'
@@ -392,7 +390,9 @@ configure_file(
   input: 'libxml++-2.6.pc.in',
   output: '@BASENAME@',
   configuration: pkg_conf_data,
+  install: true,
   install_dir: install_pkgconfigdir,
+  install_tag: 'devel',
 )
 
 xmlxxconfig_h_meson = files('libxml++config.h.meson')
@@ -401,33 +401,30 @@ configure_file(
   input: xmlxxconfig_h_meson,
   output: 'libxml++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/libxml++')
 subdir('libxml++')
 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_py,
-    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_py,
-    project_source_root,
-    'untracked' / 'build_scripts',
-  )
-endif
+# Add a ChangeLog file to the distribution directory.
+meson.add_dist_script(
+  python3, dist_changelog_py,
+  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_py,
+  project_source_root,
+  'untracked' / 'build_scripts',
+)
 
 if meson.is_subproject()
   pkgconfig_vars = {
diff --git a/tests/meson.build b/tests/meson.build
@@ -24,7 +24,8 @@ foreach ex : test_programs
   exe_file = executable(ex_name, ex_sources,
     dependencies: xmlxx_own_dep,
     implicit_include_directories: false,
-    build_by_default: build_tests
+    build_by_default: build_tests,
+    install: false,
   )
 
   if build_tests

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ foreach ex : example_programs`
`39`	`39`	`exe_file = executable(ex_name, ex_sources,`
`40`	`40`	`dependencies: xmlxx_own_dep,`
`41`	`41`	`implicit_include_directories: false,`
`42`		`- build_by_default: build_examples`
	`42`	`+ build_by_default: build_examples,`
	`43`	`+ install: false,`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`if build_examples`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ foreach ex : test_programs`
`24`	`24`	`exe_file = executable(ex_name, ex_sources,`
`25`	`25`	`dependencies: xmlxx_own_dep,`
`26`	`26`	`implicit_include_directories: false,`
`27`		`- build_by_default: build_tests`
	`27`	`+ build_by_default: build_tests,`
	`28`	`+ install: false,`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`if build_tests`