[nautilus/940-maybe-don-t-show-stable-in-about-dialog] meson.build: Don't suffix VERSION with '-stable'
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/940-maybe-don-t-show-stable-in-about-dialog] meson.build: Don't suffix VERSION with '-stable'
- Date: Sun, 19 May 2019 17:27:24 +0000 (UTC)
commit 845c75c88e4b70566ac13dafbd829dbf73e2902e
Author: António Fernandes <antoniojpfernandes gmail com>
Date: Sun May 19 17:27:13 2019 +0000
meson.build: Don't suffix VERSION with '-stable'
It is visible in the about dialog and may be wrong.
Closes https://gitlab.gnome.org/GNOME/nautilus/issues/940
meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index 156ae8609..4d8858570 100644
--- a/meson.build
+++ b/meson.build
@@ -173,6 +173,12 @@ else
fontconfig_cache_path = join_paths(libdir, 'fontconfig/cache')
endif
+if profile == ''
+ version_string = meson.project_version()
+else
+ version_string = '@0@-@VCS_TAG@'.format(meson.project_version())
+endif
+
conf.set_quoted('APPLICATION_ID', application_id)
conf.set_quoted('GETTEXT_PACKAGE', 'nautilus')
conf.set_quoted('INSTALL_PREFIX', prefix)
@@ -182,7 +188,7 @@ conf.set_quoted('NAUTILUS_DATADIR', join_paths(datadir, 'nautilus'))
conf.set_quoted('NAUTILUS_EXTENSIONDIR', join_paths(prefix, extensiondir))
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('PROFILE', profile)
-conf.set_quoted('VERSION', '@0@-@VCS_TAG@'.format(meson.project_version()))
+conf.set_quoted('VERSION', version_string)
conf.set_quoted('FONTCONFIG_CACHE_PATH', fontconfig_cache_path)
###################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]