Merge branch 'meson-bump' into 'master'

Bump the required version of Meson

See merge request GNOME/glib!924

.gitlab-ci.yml

@@ -14,7 +14,7 @@ variables:
   MESON_COMMON_OPTIONS: "--buildtype debug --fatal-meson-warnings"
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v2
   stage: build
   except:
     - tags
@@ -55,7 +55,7 @@ fedora-x86_64:
       - "_coverage"
 
 debian-stable-x86_64:
-  image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v1
+  image: registry.gitlab.gnome.org/gnome/glib/debian-stable:v3
   stage: build
   except:
     - tags
@@ -84,7 +84,7 @@ debian-stable-x86_64:
       - "_build/${CI_JOB_NAME}-report.xml"
 
 G_DISABLE_ASSERT:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v2
   stage: build
   except:
     - tags
@@ -255,7 +255,7 @@ freebsd-12-x86_64:
       - "_build/${CI_JOB_NAME}-report.xml"
 
 coverage:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v2
   stage: coverage
   except:
     - tags
@@ -268,7 +268,7 @@ coverage:
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
 
 scan-build:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v2
   stage: analysis
   except:
     - tags
@@ -301,7 +301,7 @@ pages:
       - public
 
 dist-job:
-  image: registry.gitlab.gnome.org/gnome/glib/fedora:v1
+  image: registry.gitlab.gnome.org/gnome/glib/fedora:v2
   stage: build
   only:
     - tags

.gitlab-ci/android-ndk.Dockerfile

@@ -63,7 +63,7 @@ RUN ./android-setup-env.sh arm64 21
 RUN ./android-setup-env.sh arm64 28
 RUN rm -rf $ANDROID_NDK_PATH
 
-RUN pip3 install meson==0.48.0
+RUN pip3 install meson==0.49.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/debian-stable.Dockerfile

@@ -1,9 +1,9 @@
-FROM debian:stretch
+FROM debian:buster
 
 RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \
     bindfs \
     clang \
-    clang-tools-4.0 \
+    clang-tools-7 \
     dbus \
     desktop-file-utils \
     elfutils \
@@ -61,7 +61,7 @@ RUN locale-gen de_DE.UTF-8 \
 
 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
 
-RUN pip3 install meson==0.48.0
+RUN pip3 install meson==0.49.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/fedora.Dockerfile

@@ -52,7 +52,7 @@ RUN dnf -y install \
     zlib-devel \
  && dnf clean all
 
-RUN pip3 install meson==0.48.0
+RUN pip3 install meson==0.49.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/mingw.Dockerfile

@@ -58,7 +58,7 @@ RUN dnf -y install \
 WORKDIR /opt
 COPY cross_file_mingw64.txt /opt
 
-RUN pip3 install meson==0.48.0
+RUN pip3 install meson==0.49.2
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/test-msvc.bat

@@ -5,7 +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.48.0  || goto :error
+pip3 install --upgrade --user meson==0.49.2  || goto :error
 meson _build || goto :error
 ninja -C _build || goto :error
 

.gitlab-ci/test-msys2.sh

@@ -33,7 +33,7 @@ mkdir -p _coverage
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-pip3 install --upgrade --user meson==0.48.0
+pip3 install --upgrade --user meson==0.49.2
 export PATH="$HOME/.local/bin:$PATH"
 export CFLAGS="-coverage -ftest-coverage -fprofile-arcs"
 DIR="$(pwd)"

gio/gdbus-2.0/codegen/meson.build

@@ -16,7 +16,6 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
 # Install gdbus-codegen executable
 gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
   output : 'gdbus-codegen',
-  install : true,
   install_dir : get_option('bindir'),
   configuration : gdbus_codegen_conf
 )
@@ -28,7 +27,6 @@ codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')
 gdbus_codegen_built_files = []
 gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                             output : 'config.py',
-                                            install : true,
                                             install_dir : codegen_dir,
                                             configuration : gdbus_codegen_conf)
 
@@ -36,7 +34,6 @@ 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,
                                               copy : true)
 endforeach

gio/meson.build

@@ -996,7 +996,7 @@ if enable_systemtap
     output : '@0@.stp'.format(libgio.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 subdir('fam')

gio/tests/meson.build

@@ -424,13 +424,20 @@ else
 endif
 
 foreach appinfo_test_desktop_file : appinfo_test_desktop_files
-  configure_file(
-    input: appinfo_test_desktop_file + '.in',
-    output: appinfo_test_desktop_file,
-    install_dir: installed_tests_execdir,
-    install: installed_tests_enabled,
-    configuration: cdata,
-  )
+  if installed_tests_enabled
+    configure_file(
+      input: appinfo_test_desktop_file + '.in',
+      output: appinfo_test_desktop_file,
+      install_dir: installed_tests_execdir,
+      configuration: cdata,
+    )
+  else
+    configure_file(
+      input: appinfo_test_desktop_file + '.in',
+      output: appinfo_test_desktop_file,
+      configuration: cdata,
+    )
+  endif
 endforeach
 
 if installed_tests_enabled
@@ -558,7 +565,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
   test_generated_txt = configure_file(input : 'test1.txt',
     output : 'test-generated.txt',
     copy : true,
-    install : false)
+  )
 
   resources_extra_sources = [
     test_gresource,

glib/meson.build

@@ -1,5 +1,4 @@
 configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
-  install : true,
   install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
   configuration : glibconfig_conf)
 
@@ -456,11 +455,11 @@ if enable_systemtap
     output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
 build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
 if build_tests
   subdir('tests')
-endif
+endif

gobject/meson.build

@@ -75,7 +75,6 @@ foreach tool: python_tools
     input : tool + '.in',
     output : tool,
     configuration : python_tools_conf,
-    install : true,
     install_dir : glib_bindir,
   )
 
@@ -163,11 +162,11 @@ if enable_systemtap
     output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)),
     configuration : stp_cdata,
     install_dir : tapset_install_dir,
-    install : true)
+  )
 endif
 
 # Don’t build the tests unless we can run them (either natively or in an exe wrapper)
 build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
 if build_tests
   subdir('tests')
-endif
+endif

meson.build

@@ -1,6 +1,7 @@
 project('glib', 'c', 'cpp',
   version : '2.61.2',
-  meson_version : '>= 0.48.0',
+  # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships
+  meson_version : '>= 0.49.2',
   default_options : [
     'buildtype=debugoptimized',
     'warning_level=1',
@@ -2068,7 +2069,6 @@ if have_sh
   gettextize_conf.set('datarootdir', glib_datadir)
   gettextize_conf.set('datadir', glib_datadir)
   configure_file(input : 'glib-gettextize.in',
-    install : true,
     install_dir : glib_bindir,
     output : 'glib-gettextize',
     configuration : gettextize_conf)