Merge branch 'meson-doc-ci' into 'master'

ci: Fix dist-job missing gobject/gio documentation

See merge request GNOME/glib!123

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v5
+image: registry.gitlab.gnome.org/gnome/glib/master:v6
 
 stages:
   - build
@@ -120,10 +120,10 @@ dist-job:
   only:
     - tags
   script:
-    - meson --prefix /usr --libdir /usr/lib64 --buildtype release -Dgtk_doc=true -Dman=true _build .
+    - meson --buildtype release -Dgtk_doc=true -Dman=true _build
     - cd _build
     - ninja dist
-    - ninja glib-doc
+    - ninja glib-doc gobject-doc gio-doc
     - tar -c -f "glib-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/glib html
     - tar -c -f "gobject-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gobject html
     - tar -c -f "gio-docs-$CI_COMMIT_TAG.tar.xz" -C docs/reference/gio html

.gitlab-ci/Dockerfile

@@ -48,7 +48,7 @@ RUN rm -rf $ANDROID_NDK_PATH
 
 COPY cross_file_mingw64.txt /opt
 
-RUN pip3 install meson==0.46.1
+RUN pip3 install meson==0.47.0
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib/master:v5"
+TAG="registry.gitlab.gnome.org/gnome/glib/master:v6"
 
 docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

.gitlab-ci/test-msvc.bat

@@ -5,6 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
 @echo on
 
 :: FIXME: make warnings fatal
+pip3 install --upgrade --user meson==0.47.0  || goto :error
 meson _build || goto :error
 ninja -C _build || goto :error
 

.gitlab-ci/test-msys2.sh

@@ -26,7 +26,7 @@ pacman --noconfirm -S --needed \
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson
+pip3 install --upgrade --user meson==0.47.0
 export PATH="$HOME/.local/bin:$PATH"
 export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
 

gio/fam/meson.build

@@ -1,36 +1,36 @@
-# FIXME: We should use subdir_done() instead of if blocks, but it's broken in
-# meson 0.46.1. See https://github.com/mesonbuild/meson/issues/3700.
-if get_option('fam')
-  fam_dep = cc.find_library('fam')
-  fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
-  if cc.has_function('FAMNoExists', dependencies : fam_dep)
-    fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
-  endif
-
-  deps = [
-    fam_dep,
-    libglib_dep,
-    libgobject_dep,
-    libgio_dep,
-  ]
-
-  symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map')
-  fam_ldflags = cc.get_supported_link_arguments([
-    '-Wl,--version-script,' + symbol_map,
-    '-Wl,-no-undefined',
-  ])
-
-  module = shared_module('giofam', 'gfamfilemonitor.c',
-    include_directories : [gmoduleinc],
-    dependencies : deps,
-    c_args : fam_c_args,
-    link_args : fam_ldflags,
-    link_depends : symbol_map,
-    install_dir : glib_giomodulesdir,
-    install : true,
-  )
-
-  if not meson.is_cross_build()
-    meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
-  endif
+if not get_option('fam')
+  subdir_done()
+endif
+
+fam_dep = cc.find_library('fam')
+fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args
+if cc.has_function('FAMNoExists', dependencies : fam_dep)
+  fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
+endif
+
+deps = [
+  fam_dep,
+  libglib_dep,
+  libgobject_dep,
+  libgio_dep,
+]
+
+symbol_map = join_paths(meson.current_source_dir(), 'gfamfilemonitor.map')
+fam_ldflags = cc.get_supported_link_arguments([
+  '-Wl,--version-script,' + symbol_map,
+  '-Wl,-no-undefined',
+])
+
+module = shared_module('giofam', 'gfamfilemonitor.c',
+  include_directories : [gmoduleinc],
+  dependencies : deps,
+  c_args : fam_c_args,
+  link_args : fam_ldflags,
+  link_depends : symbol_map,
+  install_dir : glib_giomodulesdir,
+  install : true,
+)
+
+if not meson.is_cross_build()
+  meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
 endif

gio/gdbus-2.0/codegen/meson.build

@@ -30,12 +30,11 @@ gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                             install_dir : codegen_dir,
                                             configuration : gdbus_codegen_conf)
 
-blank_conf = configuration_data()
 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,
-                                              configuration : blank_conf)
+                                              copy : true)
 endforeach

gio/tests/meson.build

@@ -425,7 +425,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
   # referenced by test.gresource.xml
   test_generated_txt = configure_file(input : 'test1.txt',
     output : 'test-generated.txt',
-    configuration : configuration_data(),
+    copy : true,
     install : false)
 
   exe = executable('resources', 'resources.c', test_gresource,

meson.build

@@ -1,6 +1,6 @@
 project('glib', 'c', 'cpp',
   version : '2.57.1',
-  meson_version : '>= 0.46.1',
+  meson_version : '>= 0.47.0',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=1',