From c67614b522ab2165efda5b1a53bde62fb7846ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 12 Jul 2023 16:46:29 +0200 Subject: [PATCH] extensions-app: Include a non-fake Config We currently include a fake config.js file to satisfy the indirect import from ExtensionUtils. However we're about to need to pass build-time information into the program ourselves, so generate a proper file. Part-of: --- subprojects/extensions-app/js/meson.build | 4 +++- subprojects/extensions-app/js/misc/config.js | 1 - subprojects/extensions-app/js/misc/config.js.in | 1 + subprojects/extensions-app/js/misc/meson.build | 7 +++++++ 4 files changed, 11 insertions(+), 2 deletions(-) delete mode 100644 subprojects/extensions-app/js/misc/config.js create mode 100644 subprojects/extensions-app/js/misc/config.js.in create mode 100644 subprojects/extensions-app/js/misc/meson.build diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build index ce2a7768b..c9a67f8d7 100644 --- a/subprojects/extensions-app/js/meson.build +++ b/subprojects/extensions-app/js/meson.build @@ -26,6 +26,8 @@ configure_file( install_dir: pkgdatadir, ) +subdir('misc') + gnome.compile_resources( app_id + '.src', configure_file( @@ -33,7 +35,7 @@ gnome.compile_resources( output: app_id + '.src.gresource.xml', configuration: {'profile': '/'.join(profile.split('.')) }, ), - source_dir: ['.', '../../../js'], + source_dir: ['.', meson.current_build_dir(), '../../../js'], gresource_bundle: true, install: true, install_dir: pkgdatadir diff --git a/subprojects/extensions-app/js/misc/config.js b/subprojects/extensions-app/js/misc/config.js deleted file mode 100644 index d213b7825..000000000 --- a/subprojects/extensions-app/js/misc/config.js +++ /dev/null @@ -1 +0,0 @@ -/* Fake module to satify import in ExtensionUtils */ diff --git a/subprojects/extensions-app/js/misc/config.js.in b/subprojects/extensions-app/js/misc/config.js.in new file mode 100644 index 000000000..4350f836f --- /dev/null +++ b/subprojects/extensions-app/js/misc/config.js.in @@ -0,0 +1 @@ +var PACKAGE_VERSION = '@PACKAGE_VERSION@'; diff --git a/subprojects/extensions-app/js/misc/meson.build b/subprojects/extensions-app/js/misc/meson.build new file mode 100644 index 000000000..85652ee4d --- /dev/null +++ b/subprojects/extensions-app/js/misc/meson.build @@ -0,0 +1,7 @@ +config_js = configure_file( + input: 'config.js.in', + output: '@BASENAME@', + configuration: { + 'GETTEXT_VERSION': meson.project_version(), + } +)