[gnome-builder] templates: fix gresource file name in Rust and Python build files



commit 8bf1267a5a769eb068a7457a527c5e4cdbffc9f5
Author: Çağatay Yiğit Şahin <cyigitsahin outlook com>
Date:   Tue Sep 3 01:16:31 2019 +0300

    templates: fix gresource file name in Rust and Python build files
    
    meson.build files in the templates for Rust and Python referenced
    {{name}}.gresource.xml while the plugin generated
    {{prefix}}.gresource.xml, whice broke the builds for projects with dash
    in their names. This commit changes the build files to look for the file
    with the correct name.

 src/plugins/meson-templates/resources/src/meson-py.build | 2 +-
 src/plugins/meson-templates/resources/src/meson-rs.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/meson-templates/resources/src/meson-py.build 
b/src/plugins/meson-templates/resources/src/meson-py.build
index 3c0c356a5..8fe0ac197 100644
--- a/src/plugins/meson-templates/resources/src/meson-py.build
+++ b/src/plugins/meson-templates/resources/src/meson-py.build
@@ -3,7 +3,7 @@ moduledir = join_paths(pkgdatadir, '{{name_}}')
 gnome = import('gnome')
 
 gnome.compile_resources('{{name}}',
-  '{{name}}.gresource.xml',
+  '{{prefix}}.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,
diff --git a/src/plugins/meson-templates/resources/src/meson-rs.build 
b/src/plugins/meson-templates/resources/src/meson-rs.build
index 9ba679dc3..e5e34c926 100644
--- a/src/plugins/meson-templates/resources/src/meson-rs.build
+++ b/src/plugins/meson-templates/resources/src/meson-rs.build
@@ -2,7 +2,7 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.proje
 gnome = import('gnome')
 
 gnome.compile_resources('{{name}}',
-  '{{name}}.gresource.xml',
+  '{{prefix}}.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]