[gnome-shell] build: Move metainfo version check into distscript
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] build: Move metainfo version check into distscript
- Date: Sat, 4 Sep 2021 23:58:54 +0000 (UTC)
commit 537f754fb037ce315bb3813b2a9d79f4846e2f97
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Aug 31 12:25:28 2021 +0200
build: Move metainfo version check into distscript
The time we really care about current release information in appdata is
when preparing a release, not during regular builds.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1968>
subprojects/extensions-app/build-aux/meson/check-version.py | 1 +
subprojects/extensions-app/data/metainfo/meson.build | 9 ---------
subprojects/extensions-app/meson.build | 7 +++++++
3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/subprojects/extensions-app/build-aux/meson/check-version.py
b/subprojects/extensions-app/build-aux/meson/check-version.py
new file mode 120000
index 0000000000..fbe6c74582
--- /dev/null
+++ b/subprojects/extensions-app/build-aux/meson/check-version.py
@@ -0,0 +1 @@
+../../../../meson/check-version.py
\ No newline at end of file
diff --git a/subprojects/extensions-app/data/metainfo/meson.build
b/subprojects/extensions-app/data/metainfo/meson.build
index 4406a3e5bd..c4962c0576 100644
--- a/subprojects/extensions-app/data/metainfo/meson.build
+++ b/subprojects/extensions-app/data/metainfo/meson.build
@@ -13,13 +13,4 @@ if (appstream_util.found())
args: ['validate', '--nonet', metainfo],
workdir: meson.current_build_dir()
)
-
- r = run_command(appstream_util, '--help')
- if (r.stdout().contains('validate-version'))
- test('Checking release entry for @0@'.format(meson.project_version()),
- appstream_util,
- args: ['validate-version', metainfo, meson.project_version()],
- workdir: meson.current_build_dir()
- )
- endif
endif
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 24abe118da..da539ed04f 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -62,6 +62,13 @@ if not meson.is_subproject()
meson.add_install_script('build-aux/meson/postinstall.py')
+ if appstream_util.found()
+ meson.add_dist_script('build-aux/meson/check-version.py',
+ meson.project_version(),
+ '--type=metainfo',
+ 'data/metainfo/org.gnome.Extensions.metainfo.xml.in')
+ endif
+
summary_dirs = {
'prefix': get_option('prefix'),
'bindir': get_option('bindir'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]