diff --git a/data/icons/meson.build b/data/icons/meson.build index 0e417b7..2129524 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,13 +1,12 @@ -application_id = 'io.github.Bavarder.Bavarder' - scalable_dir = join_paths('hicolor', 'scalable', 'apps') install_data( - join_paths(scalable_dir, ('@0@.svg').format(application_id)), + join_paths(scalable_dir, ('@0@.svg').format(APPLICATION_ID)), install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir) ) symbolic_dir = join_paths('hicolor', 'symbolic', 'apps') install_data( - join_paths(symbolic_dir, ('@0@-symbolic.svg').format(application_id)), - install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir) + join_paths(symbolic_dir, ('@0@-symbolic.svg').format(PROJECT_RDNN_NAME)), + install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir), + rename: '@0@-symbolic.svg'.format(APPLICATION_ID) ) diff --git a/data/io.github.Bavarder.Bavarder.appdata.xml.in b/data/io.github.Bavarder.Bavarder.appdata.xml.in.in similarity index 93% rename from data/io.github.Bavarder.Bavarder.appdata.xml.in rename to data/io.github.Bavarder.Bavarder.appdata.xml.in.in index cd7b7d2..b65c54b 100644 --- a/data/io.github.Bavarder.Bavarder.appdata.xml.in +++ b/data/io.github.Bavarder.Bavarder.appdata.xml.in.in @@ -1,12 +1,12 @@ - io.github.Bavarder.Bavarder + @APP_ID@ Bavarder Chit-chat with an AI 0xMRTT CC0-1.0 GPL-3.0-or-later - io.github.Bavarder.Bavarder.desktop + @APP_ID@.desktop @@ -24,10 +24,10 @@ - https://codeberg.org/Bavarder/Bavarder/issues - https://translate.codeberg.org/engage/bavarder/ - https://codeberg.org/Bavarder/Bavarder/issues - https://bavarder.codeberg.page + @PROJECT_URL@ + @BUGTRACKER_URL@ + @HELP_URL@ + @TRANSLATE_URL@ HiDpiIcon diff --git a/data/io.github.Bavarder.Bavarder.desktop.in b/data/io.github.Bavarder.Bavarder.desktop.in.in similarity index 77% rename from data/io.github.Bavarder.Bavarder.desktop.in rename to data/io.github.Bavarder.Bavarder.desktop.in.in index 365fffd..7a4e247 100644 --- a/data/io.github.Bavarder.Bavarder.desktop.in +++ b/data/io.github.Bavarder.Bavarder.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=Bavarder Exec=bavarder -Icon=io.github.Bavarder.Bavarder +Icon=@APP_ID@ Terminal=false Type=Application Categories=GTK; diff --git a/data/io.github.Bavarder.Bavarder.gschema.xml b/data/io.github.Bavarder.Bavarder.gschema.xml.in similarity index 92% rename from data/io.github.Bavarder.Bavarder.gschema.xml rename to data/io.github.Bavarder.Bavarder.gschema.xml.in index 3259178..506d82a 100644 --- a/data/io.github.Bavarder.Bavarder.gschema.xml +++ b/data/io.github.Bavarder.Bavarder.gschema.xml.in @@ -1,6 +1,6 @@ - + 350 diff --git a/data/meson.build b/data/meson.build index 1370b42..a982ef6 100644 --- a/data/meson.build +++ b/data/meson.build @@ -3,51 +3,73 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.proje subdir('ui') +desktop_file = i18n.merge_file( + input: configure_file( + input: '@0@.desktop.in.in'.format(PROJECT_RDNN_NAME), + output: '@BASENAME@', + configuration: conf + ), + output: '@0@.desktop'.format(APPLICATION_ID), + type: 'desktop', + po_dir: '../po', + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') +) + +desktop_utils = find_program('desktop-file-validate', required: false) +if desktop_utils.found() + test('Validate desktop file', desktop_utils, + args: [desktop_file.full_path()] + ) +endif + gnome.compile_resources('bavarder', 'bavarder.gresource.xml', gresource_bundle: true, source_dir: meson.current_build_dir(), install: true, - install_dir: pkgdatadir, - dependencies: blueprints, + install_dir: PKGDATA_DIR, + dependencies: blueprints ) -desktop_file = i18n.merge_file( - input: 'io.github.Bavarder.Bavarder.desktop.in', - output: 'io.github.Bavarder.Bavarder.desktop', - type: 'desktop', - po_dir: '../po', - install: true, - install_dir: join_paths(get_option('datadir'), 'applications') -) - -desktop_utils = find_program('desktop-file-validate', required: false) -if desktop_utils.found() - test('Validate desktop file', desktop_utils, args: [desktop_file]) -endif - appstream_file = i18n.merge_file( - input: 'io.github.Bavarder.Bavarder.appdata.xml.in', - output: 'io.github.Bavarder.Bavarder.appdata.xml', - po_dir: '../po', - install: true, + input: configure_file( + input: '@0@.appdata.xml.in.in'.format(PROJECT_RDNN_NAME), + output: '@BASENAME@', + configuration: configuration_data({ + 'APP_ID': APPLICATION_ID, + 'PROJECT_URL': PROJECT_URL, + 'BUGTRACKER_URL': BUGTRACKER_URL, + 'HELP_URL': HELP_URL, + 'TRANSLATE_URL': TRANSLATE_URL + }) + ), + output: '@0@.appdata.xml'.format(APPLICATION_ID), + po_dir: '../po', + install: true, install_dir: join_paths(get_option('datadir'), 'appdata') ) appstream_util = find_program('appstream-util', required: false) if appstream_util.found() - test('Validate appstream file', appstream_util, args: ['validate', appstream_file]) + test('Validate appstream file', appstream_util, + args: ['validate', appstream_file.full_path()] + ) endif -install_data('io.github.Bavarder.Bavarder.gschema.xml', +configure_file( + input: '@0@.gschema.xml.in'.format(PROJECT_RDNN_NAME), + output: '@0@.gschema.xml'.format(APPLICATION_ID), + configuration: conf, + install: true, install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) compile_schemas = find_program('glib-compile-schemas', required: false) if compile_schemas.found() - test('Validate schema file', - compile_schemas, - args: ['--strict', '--dry-run', meson.current_source_dir()]) + test('Validate schema file', compile_schemas, + args: ['--strict', '--dry-run', meson.current_source_dir()] + ) endif subdir('icons')