[gnome-builder] beautifier: embed beautifier resources

[Christian Hergert <chergert src gnome org>]

commit 9fed9f2ab895cdbc47fb5d0e23c1117ab5109c03
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 25 16:04:03 2017 -0700

    beautifier: embed beautifier resources
    
    Now that this is statically linked into libgnome-builer-plugins.so, we need
    to embed our resources too.

 src/plugins/beautifier/beautifier.gresource.xml    |   25 ++++++++++++++++++++
 .../data/automake/config.ini                       |    0
 .../data/c-sharp/config.ini                        |    0
 .../{beautifier_plugin => }/data/c-sharp/mono.cfg  |    0
 .../{beautifier_plugin => }/data/c/config.ini      |    0
 .../{beautifier_plugin => }/data/c/gnu-indent.cfg  |    0
 .../{beautifier_plugin => }/data/c/k&r.cfg         |    0
 .../data/c/linux-kernel.cfg                        |    0
 .../{beautifier_plugin => }/data/d/config.ini      |    0
 .../{beautifier_plugin => }/data/d/d.cfg           |    0
 .../{beautifier_plugin => }/data/global.ini        |    0
 .../{beautifier_plugin => }/data/html/config.ini   |    0
 .../data/html/tidy-autoindent.cfg                  |    0
 .../data/html/tidy-indent.cfg                      |    0
 .../{beautifier_plugin => }/data/objc/config.ini   |    0
 .../{beautifier_plugin => }/data/objc/objc.cfg     |    0
 .../{beautifier_plugin => }/data/python/config.ini |    0
 .../{beautifier_plugin => }/data/xml/config.ini    |    0
 src/plugins/beautifier/gb-beautifier.gresource.xml |    7 -----
 .../internal/align_makefile.py                     |    0
 src/plugins/beautifier/meson.build                 |    8 +----
 21 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/src/plugins/beautifier/beautifier.gresource.xml b/src/plugins/beautifier/beautifier.gresource.xml
new file mode 100644
index 0000000..f524bbd
--- /dev/null
+++ b/src/plugins/beautifier/beautifier.gresource.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/builder/plugins/beautifier_plugin">
+    <file>beautifier.plugin</file>
+    <file>gtk/menus.ui</file>
+    <file>data/xml/config.ini</file>
+    <file>data/d/config.ini</file>
+    <file>data/d/d.cfg</file>
+    <file>data/python/config.ini</file>
+    <file>data/c/config.ini</file>
+    <file>data/c/gnu-indent.cfg</file>
+    <file>data/c/linux-kernel.cfg</file>
+    <file>data/c/k&amp;r.cfg</file>
+    <file>data/html/tidy-autoindent.cfg</file>
+    <file>data/html/config.ini</file>
+    <file>data/html/tidy-indent.cfg</file>
+    <file>data/automake/config.ini</file>
+    <file>data/objc/config.ini</file>
+    <file>data/objc/objc.cfg</file>
+    <file>data/global.ini</file>
+    <file>data/c-sharp/config.ini</file>
+    <file>data/c-sharp/mono.cfg</file>
+    <file>internal/align_makefile.py</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/beautifier/beautifier_plugin/data/automake/config.ini 
b/src/plugins/beautifier/data/automake/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/automake/config.ini
rename to src/plugins/beautifier/data/automake/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c-sharp/config.ini 
b/src/plugins/beautifier/data/c-sharp/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c-sharp/config.ini
rename to src/plugins/beautifier/data/c-sharp/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c-sharp/mono.cfg 
b/src/plugins/beautifier/data/c-sharp/mono.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c-sharp/mono.cfg
rename to src/plugins/beautifier/data/c-sharp/mono.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c/config.ini 
b/src/plugins/beautifier/data/c/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c/config.ini
rename to src/plugins/beautifier/data/c/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c/gnu-indent.cfg 
b/src/plugins/beautifier/data/c/gnu-indent.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c/gnu-indent.cfg
rename to src/plugins/beautifier/data/c/gnu-indent.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c/k&r.cfg b/src/plugins/beautifier/data/c/k&r.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c/k&r.cfg
rename to src/plugins/beautifier/data/c/k&r.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/c/linux-kernel.cfg 
b/src/plugins/beautifier/data/c/linux-kernel.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/c/linux-kernel.cfg
rename to src/plugins/beautifier/data/c/linux-kernel.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/d/config.ini 
b/src/plugins/beautifier/data/d/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/d/config.ini
rename to src/plugins/beautifier/data/d/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/d/d.cfg b/src/plugins/beautifier/data/d/d.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/d/d.cfg
rename to src/plugins/beautifier/data/d/d.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/global.ini b/src/plugins/beautifier/data/global.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/global.ini
rename to src/plugins/beautifier/data/global.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/html/config.ini 
b/src/plugins/beautifier/data/html/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/html/config.ini
rename to src/plugins/beautifier/data/html/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/html/tidy-autoindent.cfg 
b/src/plugins/beautifier/data/html/tidy-autoindent.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/html/tidy-autoindent.cfg
rename to src/plugins/beautifier/data/html/tidy-autoindent.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/html/tidy-indent.cfg 
b/src/plugins/beautifier/data/html/tidy-indent.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/html/tidy-indent.cfg
rename to src/plugins/beautifier/data/html/tidy-indent.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/objc/config.ini 
b/src/plugins/beautifier/data/objc/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/objc/config.ini
rename to src/plugins/beautifier/data/objc/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/objc/objc.cfg 
b/src/plugins/beautifier/data/objc/objc.cfg
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/objc/objc.cfg
rename to src/plugins/beautifier/data/objc/objc.cfg
diff --git a/src/plugins/beautifier/beautifier_plugin/data/python/config.ini 
b/src/plugins/beautifier/data/python/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/python/config.ini
rename to src/plugins/beautifier/data/python/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/data/xml/config.ini 
b/src/plugins/beautifier/data/xml/config.ini
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/data/xml/config.ini
rename to src/plugins/beautifier/data/xml/config.ini
diff --git a/src/plugins/beautifier/beautifier_plugin/internal/align_makefile.py 
b/src/plugins/beautifier/internal/align_makefile.py
similarity index 100%
rename from src/plugins/beautifier/beautifier_plugin/internal/align_makefile.py
rename to src/plugins/beautifier/internal/align_makefile.py
diff --git a/src/plugins/beautifier/meson.build b/src/plugins/beautifier/meson.build
index 6fa72b9..40b7386 100644
--- a/src/plugins/beautifier/meson.build
+++ b/src/plugins/beautifier/meson.build
@@ -1,8 +1,8 @@
 if get_option('with_beautifier')
 
 beautifier_resources = gnome.compile_resources(
-  'gb-beautifier-resources',
-  'gb-beautifier.gresource.xml',
+  'beautifier-resources',
+  'beautifier.gresource.xml',
   c_name: 'gb_beautifier'
 )
 
@@ -22,8 +22,4 @@ beautifier_sources = [
 gnome_builder_plugins_sources += files(beautifier_sources)
 gnome_builder_plugins_sources += beautifier_resources[0]
 
-beautifier_datadir = join_paths(get_option('prefix'), plugindatadir, 'beautifier_plugin')
-install_subdir('beautifier_plugin/data', install_dir: beautifier_datadir)
-install_subdir('beautifier_plugin/internal', install_dir: beautifier_datadir)
-
 endif