diff --git a/data/icons/meson.build b/data/icons/meson.build index 13b6eb97..9e5b7439 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,6 +1,13 @@ +if profile == 'Devel' + icon_id = base_id + '.Devel' +else + icon_id = base_id +endif + install_data( - '@0@.svg'.format(application_id), + '@0@.svg'.format(icon_id), install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps', + rename: '@0@.svg'.format(application_id) ) install_data( diff --git a/meson.build b/meson.build index ea713bc5..c87bcf8c 100644 --- a/meson.build +++ b/meson.build @@ -67,7 +67,17 @@ gettext_package = meson.project_name() if get_option('profile') == 'development' profile = 'Devel' + application_id += '.Devel' +elif get_option('profile') == 'hack' + profile = 'Devel' + application_id += '.Hack' +elif get_option('profile') == 'beta' + profile = 'Beta' +else + profile = 'Stable' +endif +if profile == 'Devel' vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() if vcs_tag == '' devel_version = profile.to_lower() @@ -77,11 +87,10 @@ if get_option('profile') == 'development' full_version += '-' + devel_version release_date = run_command('git', 'show', '-s', '--format=%cI').stdout().strip() - application_id += '.' + profile -elif get_option('profile') == 'beta' - profile = 'Beta' -else - profile = 'Stable' + + # Setup pre-commit hook for ensuring coding style is always consistent + message('Setting up git pre-commit hook..') + run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit') endif meson.add_dist_script( @@ -90,12 +99,6 @@ meson.add_dist_script( meson.project_source_root() ) -if profile == 'Devel' - # Setup pre-commit hook for ensuring coding style is always consistent - message('Setting up git pre-commit hook..') - run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit') -endif - subdir('data') subdir('po') subdir('src') diff --git a/meson_options.txt b/meson_options.txt index 51d5089f..12d03017 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,7 +5,8 @@ option( 'default', 'beta', 'development', + 'hack', ], value: 'default', - description: 'The build profile for Fractal. One of "default", "beta" or "development".' + description: 'The build profile for Fractal. One of "default", "beta", "development" or "hack".' )