[gnome-maps/wip/mlundblad/fix-help-overlay-devel] Add Devel suffix when needed for shortcuts .ui resource path
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/mlundblad/fix-help-overlay-devel] Add Devel suffix when needed for shortcuts .ui resource path
- Date: Sun, 30 Jan 2022 21:58:25 +0000 (UTC)
commit 3fc647d9b206720e02d0e4e01610ac7574bee152
Author: Marcus Lundblad <ml update uu se>
Date: Tue Jan 25 22:32:40 2022 +0100
Add Devel suffix when needed for shortcuts .ui resource path
Install the shortcuts overlay using the correct
gresource path when using the development profile.
data/meson.build | 12 +++++++++++-
...ta.gresource.xml => org.gnome.Maps.data.gresource.xml.in} | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index fc2c411b..6c3d993a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,16 @@
+data_conf = configuration_data()
+if (get_option('profile') == 'development')
+ data_conf.set('suffix', '/Devel')
+else
+ data_conf.set('suffix', '')
+endif
gnome.compile_resources(
app_id + '.data',
- 'org.gnome.Maps.data.gresource.xml',
+ configure_file(
+ input: 'org.gnome.Maps.data.gresource.xml.in',
+ output: 'org.gnome.Maps.data.gresource.xml',
+ configuration: data_conf
+ ),
gresource_bundle: true,
install: true,
install_dir: pkgdatadir
diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml.in
similarity index 98%
rename from data/org.gnome.Maps.data.gresource.xml
rename to data/org.gnome.Maps.data.gresource.xml.in
index 5ad801fa..b6586e4a 100644
--- a/data/org.gnome.Maps.data.gresource.xml
+++ b/data/org.gnome.Maps.data.gresource.xml.in
@@ -44,7 +44,7 @@
<file alias="application.css">gnome-maps.css</file>
<file alias="osm-types.json" compressed="true">osm-types.json</file>
</gresource>
- <gresource prefix="/org/gnome/Maps/gtk">
+ <gresource prefix="/org/gnome/Maps@suffix@/gtk">
<file alias="help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
</gresource>
</gresources>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]