(:automated_merge:) Merge remote-tracking branch 'libsigcplusplus-original/master'

GerHobbelt · GerHobbelt · commit c27ebb465885 · 2025-03-11T03:10:56.000+01:00
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -5,7 +5,7 @@
 
 name: Publish docs
 
-# 2024-12-12: ubuntu-latest = ubuntu-22.04
+# 2025-02-05: ubuntu-latest = ubuntu-24.04
 # See https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
 on:
   # Runs on pushes targeting the default branch
@@ -39,10 +39,7 @@ jobs:
           # Prevent blocking apt install on a question during configuring of tzdata.
           export ENV DEBIAN_FRONTEND=noninteractive
           sudo apt update
-          sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ ninja-build python3-setuptools python3-pip --yes
-          # Ubuntu 22.04 contains meson 0.61.2, but libsigc++ requires meson >= 0.62.0.
-          # Install it with pip instead of apt.
-          sudo pip install "meson>=0.62.0"
+          sudo apt install libxml2-utils docbook5-xml docbook-xsl mm-common g++ meson ninja-build python3-setuptools python3-pip --yes
           meson setup -Dbuild-documentation=true -Dbuild-examples=false -Dbuild-tests=false _build
           meson compile -C _build
       - name: Collect Documentation
@@ -56,6 +53,7 @@ jobs:
           # Move generated documentation.
           mv _build/docs/docs/manual/html _publish/manual
           mv _build/docs/docs/reference/html _publish/reference
+          mv _build/docs/docs/reference/*.tag _publish/reference/html
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Build with Jekyll
diff --git a/docs/docs/manual/meson.build b/docs/docs/manual/meson.build
@@ -61,7 +61,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
diff --git a/docs/docs/reference/Doxyfile.in b/docs/docs/reference/Doxyfile.in
@@ -141,8 +141,6 @@ REFERENCES_LINK_SOURCE = YES
 SOURCE_TOOLTIPS        = YES
 USE_HTAGS              = NO
 VERBATIM_HEADERS       = NO
-CLANG_ASSISTED_PARSING = NO
-CLANG_OPTIONS          =
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
diff --git a/docs/docs/reference/meson.build b/docs/docs/reference/meson.build
@@ -102,6 +102,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',
@@ -125,7 +126,8 @@ meson.add_install_script(
   devhelp_file.full_path(),
   install_devhelpdir,
   install_reference_docdir / 'html',
-  docinstall_flags
+  docinstall_flags,
+  install_tag: 'doc',
 )
 
 # Distribute built files and files copied by mm-common-get.
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
@@ -33,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')
 cpp_compiler_id = cpp_compiler.get_id()
@@ -252,7 +251,9 @@ configure_file(
   input: sigcxxconfig_h_meson,
   output: 'sigc++config.h',
   configuration: pkg_conf_data,
+  install: true,
   install_dir: install_includeconfigdir,
+  install_tag: 'devel',
 )
 
 #subdir('cmake')
diff --git a/tests/meson.build b/tests/meson.build
@@ -70,6 +70,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.
@@ -93,7 +94,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
`@@ -61,7 +61,8 @@ custom_target('manual_html',`
`61`	`61`	`],`
`62`	`62`	`build_by_default: true,`
`63`	`63`	`install: true,`
`64`		`- install_dir: install_tutorialdir`
	`64`	`+ install_dir: install_tutorialdir,`
	`65`	`+ install_tag: 'doc',`
`65`	`66`	`)`
`66`	`67`
`67`	`68`	`if can_parse_and_validate`
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`