[gnome-builder] build: don't embed beautifier plugin

[Christian Hergert <chergert src gnome org>]

commit 88cd3fc50cc21b91b9e19985cde29c8097890b16
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 25 16:18:01 2017 -0700

    build: don't embed beautifier plugin
    
    The beautifier plugin does not currently know how to access embedded
    resources, and when embedding it, we get a different data_dir back from
    libpeas.
    
    So for now, lets just not embed the plugin and once that is all fixed,
    we can change it to use embedded plugins.

 src/plugins/beautifier/beautifier.plugin           |    1 -
 src/plugins/beautifier/gb-beautifier-plugin.c      |    2 +-
 src/plugins/beautifier/gb-beautifier.gresource.xml |    1 -
 src/plugins/beautifier/meson.build                 |   19 +++++++++++++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/src/plugins/beautifier/beautifier.plugin b/src/plugins/beautifier/beautifier.plugin
index d30494d..9cc60c9 100644
--- a/src/plugins/beautifier/beautifier.plugin
+++ b/src/plugins/beautifier/beautifier.plugin
@@ -6,4 +6,3 @@ Authors=Sébastien Lafargue <slafargue gnome org>
 Copyright=Copyright © 2016 Sébastien Lafargue
 Depends=editor
 Builtin=true
-Embedded=gb_beautifier_register_types
diff --git a/src/plugins/beautifier/gb-beautifier-plugin.c b/src/plugins/beautifier/gb-beautifier-plugin.c
index 81dc4cf..8745967 100644
--- a/src/plugins/beautifier/gb-beautifier-plugin.c
+++ b/src/plugins/beautifier/gb-beautifier-plugin.c
@@ -22,7 +22,7 @@
 #include "gb-beautifier-editor-addin.h"
 
 void
-gb_beautifier_register_types (PeasObjectModule *module)
+peas_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_EDITOR_ADDIN,
diff --git a/src/plugins/beautifier/gb-beautifier.gresource.xml 
b/src/plugins/beautifier/gb-beautifier.gresource.xml
index c1fb12f..f5ec9f1 100644
--- a/src/plugins/beautifier/gb-beautifier.gresource.xml
+++ b/src/plugins/beautifier/gb-beautifier.gresource.xml
@@ -1,7 +1,6 @@
 <?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>
   </gresource>
 </gresources>
diff --git a/src/plugins/beautifier/meson.build b/src/plugins/beautifier/meson.build
index 6fa72b9..f89b849 100644
--- a/src/plugins/beautifier/meson.build
+++ b/src/plugins/beautifier/meson.build
@@ -19,9 +19,24 @@ beautifier_sources = [
   'gb-beautifier-editor-addin.h',
 ]
 
-gnome_builder_plugins_sources += files(beautifier_sources)
-gnome_builder_plugins_sources += beautifier_resources[0]
+shared_module('beautifier_plugin', beautifier_sources,
+  dependencies: [libpeas_dep, libide_plugin_dep],
+     link_args: [gnome_builder_plugins_link_args],
+  link_depends: [gnome_builder_plugins_link_deps],
+       install: true,
+   install_dir: plugindir,
+)
+
+configure_file(
+          input: 'beautifier.plugin',
+         output: 'beautifier.plugin',
+  configuration: configuration_data(),
+        install: true,
+    install_dir: plugindir,
+)
 
+# TODO: Make the beautifier work with embedded resources so that
+#       we can statically link the plugin into libgnome-builder-plugins.so
 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)