[nautilus/gnome-3-28] meson.build: Always try to append revision to version
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/gnome-3-28] meson.build: Always try to append revision to version
- Date: Mon, 19 Mar 2018 11:15:35 +0000 (UTC)
commit f8745282945867817997229674c40bd658e36f2a
Author: Ernestas Kulik <ernestask gnome org>
Date: Mon Mar 19 13:08:49 2018 +0200
meson.build: Always try to append revision to version
The code falls back to a controlled string, so tarballs builds don’t
ruin everything.
meson.build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 74bb46cf5..e01a3de09 100644
--- a/meson.build
+++ b/meson.build
@@ -93,22 +93,19 @@ xml = dependency('libxml-2.0', version: '>= 2.7.8')
conf = configuration_data()
if get_option('profile') == 'development'
- version = '@0@-@VCS_TAG@'.format(meson.project_version())
profile = 'Devel'
name_suffix = ' (Development Snapshot)'
elif get_option('profile') == 'stable-flatpak'
- version = '@0@-flatpak'.format(meson.project_version())
profile = 'StableFlatpak'
name_suffix = ' (3.28 Flatpak)'
else
- version = meson.project_version()
profile = ''
name_suffix = ''
endif
application_id = 'org.gnome.Nautilus@0@'.format(profile)
-conf.set_quoted('VERSION', version)
+conf.set_quoted('VERSION', '@0@-@VCS_TAG@'.format(meson.project_version()))
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('GETTEXT_PACKAGE', 'nautilus')
conf.set_quoted('LOCALEDIR', join_paths(prefix, get_option('localedir')))
@@ -131,7 +128,7 @@ endif
config_h = declare_dependency(
sources: vcs_tag(
command: ['git', 'rev-parse', '--short', 'HEAD'],
- fallback: 'devel',
+ fallback: get_option('profile') != 'default'? 'devel' : 'stable',
input: configure_file(
output: 'config.h.in',
configuration: conf
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]