Show correct version in about dialog
This commit is contained in:
@@ -5,6 +5,7 @@ config = configure_file(
|
|||||||
'APP_ID': app_id,
|
'APP_ID': app_id,
|
||||||
'BUILDDIR': meson.project_build_root(),
|
'BUILDDIR': meson.project_build_root(),
|
||||||
'PKGDATADIR': pkgdatadir,
|
'PKGDATADIR': pkgdatadir,
|
||||||
|
'VERSION': version,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
use gtk::prelude::*;
|
use gtk::prelude::*;
|
||||||
use relm4::{prelude::*, ComponentParts, SimpleComponent};
|
use relm4::{prelude::*, ComponentParts, SimpleComponent};
|
||||||
|
|
||||||
use crate::meson_config::APP_ID;
|
use crate::meson_config::{APP_ID, VERSION};
|
||||||
|
|
||||||
pub(crate) struct About;
|
pub(crate) struct About;
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ impl SimpleComponent for About {
|
|||||||
) {
|
) {
|
||||||
set_modal: true,
|
set_modal: true,
|
||||||
set_visible: true,
|
set_visible: true,
|
||||||
set_version: "0.0",
|
set_version: VERSION,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -3,3 +3,4 @@
|
|||||||
pub const APP_ID: &str = "@APP_ID@";
|
pub const APP_ID: &str = "@APP_ID@";
|
||||||
pub const BUILDDIR: &str = "@BUILDDIR@";
|
pub const BUILDDIR: &str = "@BUILDDIR@";
|
||||||
pub const RESOURCES_FILE: &str = concat!("@PKGDATADIR@", "/resources.gresource");
|
pub const RESOURCES_FILE: &str = concat!("@PKGDATADIR@", "/resources.gresource");
|
||||||
|
pub const VERSION: &str = "@VERSION@";
|
||||||
|
14
meson.build
14
meson.build
@@ -4,6 +4,7 @@ project(
|
|||||||
version: '0.1.0',
|
version: '0.1.0',
|
||||||
# bad hack to compile libvideo-player-mpv
|
# bad hack to compile libvideo-player-mpv
|
||||||
subproject_dir: 'video_player_mpv',
|
subproject_dir: 'video_player_mpv',
|
||||||
|
meson_version: '>= 0.59',
|
||||||
)
|
)
|
||||||
|
|
||||||
dependency('gtk4', version: '>= 4.0.0')
|
dependency('gtk4', version: '>= 4.0.0')
|
||||||
@@ -18,6 +19,19 @@ else
|
|||||||
app_id = base_id
|
app_id = base_id
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
version = meson.project_version()
|
||||||
|
if get_option('profile') == 'dev'
|
||||||
|
vcs_tag = run_command(
|
||||||
|
'git', 'rev-parse', '--short', 'HEAD',
|
||||||
|
check: false,
|
||||||
|
).stdout().strip()
|
||||||
|
if vcs_tag == ''
|
||||||
|
version += '-devel'
|
||||||
|
else
|
||||||
|
version += f'-@vcs_tag@'
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
if get_option('flatpak')
|
if get_option('flatpak')
|
||||||
meson.add_dist_script(
|
meson.add_dist_script(
|
||||||
'build-aux/dist-vendor',
|
'build-aux/dist-vendor',
|
||||||
|
Reference in New Issue
Block a user