diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-09-02 00:24:24 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-09-02 00:24:24 +0000 |
| commit | d240fcde6fd295a15a6f6122dce9a3ab01c84dca (patch) | |
| tree | 1e4ec56e36ea4e7931cce1fcabab50e613b7db55 | |
| parent | 01e45dc8ceecf5e5f36e049d0d4f615264737c90 (diff) | |
| parent | 95f962ee48f323df0a5754f2abf73e41045a5907 (diff) | |
| download | libgweather-d240fcde6fd295a15a6f6122dce9a3ab01c84dca.tar.gz | |
Merge branch 'use-gnome.post_install' into 'main'
build: Use GNOME module post_install()
See merge request GNOME/libgweather!215
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rwxr-xr-x | build-aux/meson/meson_post_install.py | 14 | ||||
| -rw-r--r-- | meson.build | 6 |
3 files changed, 10 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 125cb7e..b1eb777 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ fedora-x86_64: python3-wheel redhat-rpm-config vala - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "--buildtype=debug -Dwerror=true -Dgtk_doc=false -Dsoup2=true" fedora-x86_64-soup3: @@ -151,7 +151,7 @@ fedora-x86_64-soup3: redhat-rpm-config sqlite-devel vala - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "--buildtype=debug -Dwerror=true -Dgtk_doc=false -Dsoup2=false" before_script: # Undo delangification present in the Fedora Docker images @@ -208,7 +208,7 @@ static-scan: python3-pip python3-wheel redhat-rpm-config - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false -Dsoup2=true" script: - meson setup --prefix /usr ${MESON_EXTRA_FLAGS} _scan_build . @@ -246,7 +246,7 @@ asan-build: python3-wheel redhat-rpm-config vala - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "--buildtype=debug -Db_sanitize=address -Db_lundef=false -Dintrospection=false -Dgtk_doc=false -Dsoup2=true" script: - CC=clang meson setup --prefix /usr ${MESON_EXTRA_FLAGS} _asan_build . @@ -282,7 +282,7 @@ coverage: python3-pip python3-wheel redhat-rpm-config - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "--buildtype=debug -Dgtk_doc=false -Dintrospection=false -Dsoup2=true" CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" script: @@ -325,7 +325,7 @@ reference: python3-wheel redhat-rpm-config vala - MESON_VERSION: "0.55.3" + MESON_VERSION: "0.57.2" MESON_EXTRA_FLAGS: "-Dsoup2=true" DOCS_FLAGS: "-Dgtk_doc=true" DOCS_PATH: doc/libgweather-4.0 diff --git a/build-aux/meson/meson_post_install.py b/build-aux/meson/meson_post_install.py deleted file mode 100755 index 15eaaa0..0000000 --- a/build-aux/meson/meson_post_install.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python3 - -# SPDX-FileCopyrightText: 2017 Giovanni Campagna -# SPDX-License-Identifier: GPL-2.0-or-later - -import os -import subprocess - -prefix = os.environ['MESON_INSTALL_PREFIX'] -schemadir = os.path.join(prefix, 'share', 'glib-2.0', 'schemas') - -if not os.environ.get('DESTDIR'): - print('Compiling gsettings schemas...') - subprocess.call(['glib-compile-schemas', schemadir]) diff --git a/meson.build b/meson.build index 8d56d69..4a36cf5 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('libgweather', 'c', version: '4.1.1', license: 'GPL-2.0-or-later', - meson_version: '>= 0.55.0', + meson_version: '>= 0.57.0', default_options: [ 'warning_level=2', 'buildtype=debugoptimized', @@ -61,7 +61,9 @@ subdir('doc') subdir('po') subdir('po-locations') -meson.add_install_script('build-aux/meson/meson_post_install.py') +gnome.post_install( + glib_compile_schemas: true, +) summary({ 'prefix': prefix, |