[gnome-builder] templates: use .tmpl suffix to avoid loading manifest
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] templates: use .tmpl suffix to avoid loading manifest
- Date: Tue, 30 Jan 2018 13:05:21 +0000 (UTC)
commit f9e5554ecfd4a6b46143e0bbbcd40c8ac984dd9b
Author: Christian Hergert <chergert redhat com>
Date: Tue Jan 30 04:57:42 2018 -0800
templates: use .tmpl suffix to avoid loading manifest
We don't want the manifests to attempt to get loaded, so use a .tmpl suffix
here so it doesn't match our *.json glob pattern.
src/plugins/meson-templates/meson-templates.gresource.xml | 2 +-
src/plugins/meson-templates/meson_templates.py | 2 +-
.../resources/{flatpak-gtksharp.json => flatpak-gtksharp.json.tmpl} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/meson-templates/meson-templates.gresource.xml
b/src/plugins/meson-templates/meson-templates.gresource.xml
index 594bce612..1ee3e0789 100644
--- a/src/plugins/meson-templates/meson-templates.gresource.xml
+++ b/src/plugins/meson-templates/meson-templates.gresource.xml
@@ -33,7 +33,7 @@
<file compressed="true">resources/build-aux/meson/postinstall.py</file>
<file compressed="true">resources/meson.build</file>
<file compressed="true">resources/flatpak.json</file>
- <file compressed="true">resources/flatpak-gtksharp.json</file>
+ <file compressed="true">resources/flatpak-gtksharp.json.tmpl</file>
<file compressed="true">resources/data/meson.build</file>
<file compressed="true">resources/data/hello.gschema.xml</file>
<file compressed="true">resources/data/hello.desktop.in</file>
diff --git a/src/plugins/meson-templates/meson_templates.py b/src/plugins/meson-templates/meson_templates.py
index 6af435474..ab80416e4 100644
--- a/src/plugins/meson-templates/meson_templates.py
+++ b/src/plugins/meson-templates/meson_templates.py
@@ -266,7 +266,7 @@ class GnomeProjectTemplate(MesonTemplate):
elif self.language == 'c♯':
files['resources/src/main.cs'] = 'src/main.cs'
files['resources/src/application.in'] = 'src/%(exec_name)s.in'
- files['resources/flatpak-gtksharp.json'] = '%(appid)s.json'
+ files['resources/flatpak-gtksharp.json.tmpl'] = '%(appid)s.json'
meson_file = 'resources/src/meson-cs.build'
resource_name = None
window_ui_name = None
diff --git a/src/plugins/meson-templates/resources/flatpak-gtksharp.json
b/src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl
similarity index 100%
rename from src/plugins/meson-templates/resources/flatpak-gtksharp.json
rename to src/plugins/meson-templates/resources/flatpak-gtksharp.json.tmpl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]