[gnome-builder] meson-templates: use gresources for template files

[Christian Hergert <chergert src gnome org>]

commit 12f3dc7c2a1a2d2e9c35d9dcdd321c0413797a9c
Author: Christian Hergert <chergert redhat com>
Date:   Tue Sep 19 20:16:36 2017 -0700

    meson-templates: use gresources for template files
    
    This moves the template files for the meson-templates plugin
    into a .gresources which can be loaded by the plugin layer.

 .../meson-templates/meson-templates.gresource.xml  |   38 ++++++++++++++++++++
 plugins/meson-templates/meson.build                |   10 ++++-
 .../meson-templates/meson_templates/__init__.py    |   12 +-----
 .../resources/build-aux/meson/postinstall.py       |    0
 .../resources/data/hello.appdata.xml.in            |    0
 .../resources/data/hello.desktop.in                |    0
 .../resources/data/hello.gschema.xml               |    0
 .../resources/data/meson.build                     |    0
 .../{meson_templates => }/resources/flatpak.json   |    0
 .../{meson_templates => }/resources/meson.build    |    0
 .../{meson_templates => }/resources/po/LINGUAS     |    0
 .../{meson_templates => }/resources/po/POTFILES    |    0
 .../{meson_templates => }/resources/po/meson.build |    0
 .../resources/src/__init__.py                      |    0
 .../resources/src/gi_composites.py                 |    0
 .../resources/src/hello-version.h.in               |    0
 .../resources/src/hello.gresource.xml              |    0
 .../{meson_templates => }/resources/src/hello.h    |    0
 .../resources/src/hello.js.in                      |    0
 .../resources/src/hello.py.in                      |    0
 .../resources/src/hello.src.gresource.xml          |    0
 .../{meson_templates => }/resources/src/main.c     |    0
 .../{meson_templates => }/resources/src/main.js    |    0
 .../{meson_templates => }/resources/src/main.py    |    0
 .../{meson_templates => }/resources/src/main.vala  |    0
 .../resources/src/meson-c-vala.build               |    0
 .../resources/src/meson-clib.build                 |    0
 .../resources/src/meson-empty.build                |    0
 .../resources/src/meson-js.build                   |    0
 .../resources/src/meson-py.build                   |    0
 .../{meson_templates => }/resources/src/window.c   |    0
 .../{meson_templates => }/resources/src/window.h   |    0
 .../{meson_templates => }/resources/src/window.js  |    0
 .../{meson_templates => }/resources/src/window.py  |    0
 .../{meson_templates => }/resources/src/window.ui  |    0
 .../resources/src/window.vala                      |    0
 36 files changed, 48 insertions(+), 12 deletions(-)
---
diff --git a/plugins/meson-templates/meson-templates.gresource.xml 
b/plugins/meson-templates/meson-templates.gresource.xml
new file mode 100644
index 0000000..67cb444
--- /dev/null
+++ b/plugins/meson-templates/meson-templates.gresource.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/builder/plugins/meson_templates">
+    <file compressed="true">resources/src/window.ui</file>
+    <file compressed="true">resources/src/window.js</file>
+    <file compressed="true">resources/src/meson-py.build</file>
+    <file compressed="true">resources/src/window.h</file>
+    <file compressed="true">resources/src/hello.js.in</file>
+    <file compressed="true">resources/src/hello.gresource.xml</file>
+    <file compressed="true">resources/src/hello-version.h.in</file>
+    <file compressed="true">resources/src/meson-clib.build</file>
+    <file compressed="true">resources/src/meson-js.build</file>
+    <file compressed="true">resources/src/hello.h</file>
+    <file compressed="true">resources/src/__init__.py</file>
+    <file compressed="true">resources/src/meson-c-vala.build</file>
+    <file compressed="true">resources/src/meson-empty.build</file>
+    <file compressed="true">resources/src/gi_composites.py</file>
+    <file compressed="true">resources/src/main.js</file>
+    <file compressed="true">resources/src/main.c</file>
+    <file compressed="true">resources/src/window.py</file>
+    <file compressed="true">resources/src/window.c</file>
+    <file compressed="true">resources/src/hello.src.gresource.xml</file>
+    <file compressed="true">resources/src/window.vala</file>
+    <file compressed="true">resources/src/main.vala</file>
+    <file compressed="true">resources/src/hello.py.in</file>
+    <file compressed="true">resources/src/main.py</file>
+    <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/data/meson.build</file>
+    <file compressed="true">resources/data/hello.gschema.xml</file>
+    <file compressed="true">resources/data/hello.desktop.in</file>
+    <file compressed="true">resources/data/hello.appdata.xml.in</file>
+    <file compressed="true">resources/po/meson.build</file>
+    <file compressed="true">resources/po/POTFILES</file>
+    <file compressed="true">resources/po/LINGUAS</file>
+  </gresource>
+</gresources>
diff --git a/plugins/meson-templates/meson.build b/plugins/meson-templates/meson.build
index ba1c780..a16a45e 100644
--- a/plugins/meson-templates/meson.build
+++ b/plugins/meson-templates/meson.build
@@ -1,10 +1,16 @@
 if get_option('with_meson_templates')
 
-meson_template_datadir = join_paths(plugindatadir, 'meson_templates')
+devhelp_resources = gnome.compile_resources(
+  'meson_templates',
+  'meson-templates.gresource.xml',
+  gresource_bundle: true,
+           install: true,
+       install_dir: plugindir,
+)
+
 meson_template_dir = join_paths(plugindir, 'meson_templates')
 
 install_data('meson_templates/__init__.py', install_dir: meson_template_dir)
-install_subdir('meson_templates/resources', install_dir: meson_template_datadir)
 
 configure_file(
           input: 'meson-templates.plugin',
diff --git a/plugins/meson-templates/meson_templates/__init__.py 
b/plugins/meson-templates/meson_templates/__init__.py
index 84e9388..beda875 100644
--- a/plugins/meson-templates/meson_templates/__init__.py
+++ b/plugins/meson-templates/meson_templates/__init__.py
@@ -35,14 +35,6 @@ from gi.repository import (
 
 _ = Ide.gettext
 
-
-def get_module_data_path(name):
-    engine = Peas.Engine.get_default()
-    plugin = engine.get_plugin_info('meson_templates')
-    data_dir = plugin.get_data_dir()
-    return path.join(data_dir, name)
-
-
 class LibraryTemplateProvider(GObject.Object, Ide.TemplateProvider):
     def do_get_project_templates(self):
         return [GnomeProjectTemplate(), LibraryProjectTemplate(), EmptyProjectTemplate()]
@@ -208,8 +200,8 @@ class MesonTemplate(Ide.TemplateBase, Ide.ProjectTemplate):
             if src.startswith('resource://'):
                 self.add_resource(src[11:], destination, scope, modes.get(src, 0))
             else:
-                path = get_module_data_path(src)
-                self.add_path(path, destination, scope, modes.get(src, 0))
+                path = os.path.join('/org/gnome/builder/plugins/meson_templates', src)
+                self.add_resource(path, destination, scope, modes.get(src, 0))
 
         self.expand_all_async(cancellable, self.expand_all_cb, task)
 
diff --git a/plugins/meson-templates/meson_templates/resources/build-aux/meson/postinstall.py 
b/plugins/meson-templates/resources/build-aux/meson/postinstall.py
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/build-aux/meson/postinstall.py
rename to plugins/meson-templates/resources/build-aux/meson/postinstall.py
diff --git a/plugins/meson-templates/meson_templates/resources/data/hello.appdata.xml.in 
b/plugins/meson-templates/resources/data/hello.appdata.xml.in
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/data/hello.appdata.xml.in
rename to plugins/meson-templates/resources/data/hello.appdata.xml.in
diff --git a/plugins/meson-templates/meson_templates/resources/data/hello.desktop.in 
b/plugins/meson-templates/resources/data/hello.desktop.in
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/data/hello.desktop.in
rename to plugins/meson-templates/resources/data/hello.desktop.in
diff --git a/plugins/meson-templates/meson_templates/resources/data/hello.gschema.xml 
b/plugins/meson-templates/resources/data/hello.gschema.xml
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/data/hello.gschema.xml
rename to plugins/meson-templates/resources/data/hello.gschema.xml
diff --git a/plugins/meson-templates/meson_templates/resources/data/meson.build 
b/plugins/meson-templates/resources/data/meson.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/data/meson.build
rename to plugins/meson-templates/resources/data/meson.build
diff --git a/plugins/meson-templates/meson_templates/resources/flatpak.json 
b/plugins/meson-templates/resources/flatpak.json
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/flatpak.json
rename to plugins/meson-templates/resources/flatpak.json
diff --git a/plugins/meson-templates/meson_templates/resources/meson.build 
b/plugins/meson-templates/resources/meson.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/meson.build
rename to plugins/meson-templates/resources/meson.build
diff --git a/plugins/meson-templates/meson_templates/resources/po/LINGUAS 
b/plugins/meson-templates/resources/po/LINGUAS
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/po/LINGUAS
rename to plugins/meson-templates/resources/po/LINGUAS
diff --git a/plugins/meson-templates/meson_templates/resources/po/POTFILES 
b/plugins/meson-templates/resources/po/POTFILES
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/po/POTFILES
rename to plugins/meson-templates/resources/po/POTFILES
diff --git a/plugins/meson-templates/meson_templates/resources/po/meson.build 
b/plugins/meson-templates/resources/po/meson.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/po/meson.build
rename to plugins/meson-templates/resources/po/meson.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/__init__.py 
b/plugins/meson-templates/resources/src/__init__.py
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/__init__.py
rename to plugins/meson-templates/resources/src/__init__.py
diff --git a/plugins/meson-templates/meson_templates/resources/src/gi_composites.py 
b/plugins/meson-templates/resources/src/gi_composites.py
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/gi_composites.py
rename to plugins/meson-templates/resources/src/gi_composites.py
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello-version.h.in 
b/plugins/meson-templates/resources/src/hello-version.h.in
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello-version.h.in
rename to plugins/meson-templates/resources/src/hello-version.h.in
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello.gresource.xml 
b/plugins/meson-templates/resources/src/hello.gresource.xml
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello.gresource.xml
rename to plugins/meson-templates/resources/src/hello.gresource.xml
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello.h 
b/plugins/meson-templates/resources/src/hello.h
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello.h
rename to plugins/meson-templates/resources/src/hello.h
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello.js.in 
b/plugins/meson-templates/resources/src/hello.js.in
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello.js.in
rename to plugins/meson-templates/resources/src/hello.js.in
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello.py.in 
b/plugins/meson-templates/resources/src/hello.py.in
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello.py.in
rename to plugins/meson-templates/resources/src/hello.py.in
diff --git a/plugins/meson-templates/meson_templates/resources/src/hello.src.gresource.xml 
b/plugins/meson-templates/resources/src/hello.src.gresource.xml
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/hello.src.gresource.xml
rename to plugins/meson-templates/resources/src/hello.src.gresource.xml
diff --git a/plugins/meson-templates/meson_templates/resources/src/main.c 
b/plugins/meson-templates/resources/src/main.c
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/main.c
rename to plugins/meson-templates/resources/src/main.c
diff --git a/plugins/meson-templates/meson_templates/resources/src/main.js 
b/plugins/meson-templates/resources/src/main.js
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/main.js
rename to plugins/meson-templates/resources/src/main.js
diff --git a/plugins/meson-templates/meson_templates/resources/src/main.py 
b/plugins/meson-templates/resources/src/main.py
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/main.py
rename to plugins/meson-templates/resources/src/main.py
diff --git a/plugins/meson-templates/meson_templates/resources/src/main.vala 
b/plugins/meson-templates/resources/src/main.vala
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/main.vala
rename to plugins/meson-templates/resources/src/main.vala
diff --git a/plugins/meson-templates/meson_templates/resources/src/meson-c-vala.build 
b/plugins/meson-templates/resources/src/meson-c-vala.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/meson-c-vala.build
rename to plugins/meson-templates/resources/src/meson-c-vala.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/meson-clib.build 
b/plugins/meson-templates/resources/src/meson-clib.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/meson-clib.build
rename to plugins/meson-templates/resources/src/meson-clib.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/meson-empty.build 
b/plugins/meson-templates/resources/src/meson-empty.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/meson-empty.build
rename to plugins/meson-templates/resources/src/meson-empty.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/meson-js.build 
b/plugins/meson-templates/resources/src/meson-js.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/meson-js.build
rename to plugins/meson-templates/resources/src/meson-js.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/meson-py.build 
b/plugins/meson-templates/resources/src/meson-py.build
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/meson-py.build
rename to plugins/meson-templates/resources/src/meson-py.build
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.c 
b/plugins/meson-templates/resources/src/window.c
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.c
rename to plugins/meson-templates/resources/src/window.c
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.h 
b/plugins/meson-templates/resources/src/window.h
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.h
rename to plugins/meson-templates/resources/src/window.h
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.js 
b/plugins/meson-templates/resources/src/window.js
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.js
rename to plugins/meson-templates/resources/src/window.js
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.py 
b/plugins/meson-templates/resources/src/window.py
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.py
rename to plugins/meson-templates/resources/src/window.py
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.ui 
b/plugins/meson-templates/resources/src/window.ui
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.ui
rename to plugins/meson-templates/resources/src/window.ui
diff --git a/plugins/meson-templates/meson_templates/resources/src/window.vala 
b/plugins/meson-templates/resources/src/window.vala
similarity index 100%
rename from plugins/meson-templates/meson_templates/resources/src/window.vala
rename to plugins/meson-templates/resources/src/window.vala