diff --git a/GTG/core/meson.build b/GTG/core/meson.build index 9a4828345..72c107c14 100644 --- a/GTG/core/meson.build +++ b/GTG/core/meson.build @@ -1,14 +1,19 @@ -# Append short commit hash and put it in -# info.py when using development profile. -# Use git rev-parse --short HEAD if available. - git = find_program('git', required : false, disabler : true) if git.found() and get_option('profile') == 'development' - version = meson.project_version() + '-' + run_command( + base_version = meson.project_version() + commit = run_command( ['git', 'rev-parse', '--short', 'HEAD'], check: true ).stdout().strip() + version = base_version + '-' + commit +elif get_option('profile') == 'flatpak_snapshot' + base_version = meson.project_version() + date = run_command( + ['date', '--utc', '+%Y%m%d'], + check: true + ).stdout().strip() + version = base_version + '-' + date else version = meson.project_version() endif diff --git a/build-aux/org.gnome.GTG.Devel.json b/build-aux/org.gnome.GTG.Devel.json index 9da2661f8..5b2bcd9eb 100644 --- a/build-aux/org.gnome.GTG.Devel.json +++ b/build-aux/org.gnome.GTG.Devel.json @@ -66,7 +66,7 @@ { "name": "gtg", "config-opts" : [ - "-Dprofile=development" + "-Dprofile=flatpak_snapshot" ], "buildsystem": "meson", "sources": [{ diff --git a/data/org.gnome.GTG.appdata.xml.in.in b/data/org.gnome.GTG.appdata.xml.in.in index 61a6f4a67..3d2ebaaf5 100644 --- a/data/org.gnome.GTG.appdata.xml.in.in +++ b/data/org.gnome.GTG.appdata.xml.in.in @@ -51,6 +51,11 @@ nekohayo+gtg@gmail.com + + + + + https://fortintam.com/blog/gtg-0-6-released diff --git a/meson.build b/meson.build index 07483b223..2061bd316 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gtg', - version: '0.6.0', + version: '0.7-dev', meson_version: '>= 0.51.0' ) @@ -25,7 +25,7 @@ pythondir = python3.get_path('purelib') rdnn_name = 'org.gnome.GTG' application_id = rdnn_name -if get_option('profile') == 'development' +if get_option('profile') == 'development' or get_option('profile') == 'flatpak_snapshot' application_id = rdnn_name + '.Devel' endif diff --git a/meson_options.txt b/meson_options.txt index c962c6b2a..1125fe376 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,7 +3,8 @@ option( type: 'combo', choices: [ 'default', - 'development' + 'development', + 'flatpak_snapshot' ], value: 'default', description: 'Changes App ID'