rename the devel app-id

This commit is contained in:
Bilal Elmoussaoui 2020-10-28 01:59:41 +01:00
parent f2748e36d9
commit 6509531d81
5 changed files with 4 additions and 9 deletions

View file

@ -1,5 +1,5 @@
{
"app-id": "com.belmoussaoui.AuthenticatorDevel",
"app-id": "com.belmoussaoui.Authenticator.Devel",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",

View file

@ -16,7 +16,6 @@ glib_compile_resources = find_program('glib-compile-resources', required: true)
cargo_script = find_program('build-aux/cargo.sh')
version = meson.project_version()
version_array = version.split('.')
major_version = version_array[0].to_int()
@ -34,8 +33,8 @@ podir = meson.source_root () / 'po'
gettext_package = meson.project_name()
if get_option('profile') == 'development'
application_id = 'com.belmoussaoui.Authenticator.Devel'
profile = 'Devel'
name_prefix = '(Development) '
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
if vcs_tag == ''
version_suffix = '-devel'
@ -44,12 +43,10 @@ if get_option('profile') == 'development'
endif
else
profile = ''
name_suffix = ''
version_suffix = ''
name_prefix = ''
application_id = 'com.belmoussaoui.Authenticator'
endif
application_id = 'com.belmoussaoui.Authenticator@0@'.format(profile)
i18n = import('i18n')

View file

@ -42,7 +42,7 @@ impl Application {
}
pub fn run(&self, app: Rc<Self>) {
info!("{}Authenticator ({})", config::NAME_PREFIX, config::APP_ID);
info!("Authenticator ({})", config::APP_ID);
info!("Version: {} ({})", config::VERSION, config::PROFILE);
info!("Datadir: {}", config::PKGDATADIR);

View file

@ -1,7 +1,6 @@
pub static APP_ID: &str = @APP_ID@;
pub static PKGDATADIR: &str = @PKGDATADIR@;
pub static PROFILE: &str = @PROFILE@;
pub static NAME_PREFIX: &str = @NAME_PREFIX@;
pub static VERSION: &str = @VERSION@;
pub static GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
pub static LOCALEDIR: &str = @LOCALEDIR@;

View file

@ -4,7 +4,6 @@ global_conf = configuration_data()
global_conf.set_quoted('APP_ID', application_id)
global_conf.set_quoted('PKGDATADIR', pkgdatadir)
global_conf.set_quoted('PROFILE', profile)
global_conf.set_quoted('NAME_PREFIX', name_prefix)
global_conf.set_quoted('VERSION', version + version_suffix)
global_conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
global_conf.set_quoted('LOCALEDIR', localedir)