Commit 88cd3fc5 authored by Christian Hergert's avatar Christian Hergert
Browse files

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

So for now, lets just not embed the plugin and once that is all fixed,
we can change it to use embedded plugins.
parent caeb1678
...@@ -6,4 +6,3 @@ Authors=Sébastien Lafargue <> ...@@ -6,4 +6,3 @@ Authors=Sébastien Lafargue <>
Copyright=Copyright © 2016 Sébastien Lafargue Copyright=Copyright © 2016 Sébastien Lafargue
Depends=editor Depends=editor
Builtin=true Builtin=true
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "gb-beautifier-editor-addin.h" #include "gb-beautifier-editor-addin.h"
void void
gb_beautifier_register_types (PeasObjectModule *module) peas_register_types (PeasObjectModule *module)
{ {
peas_object_module_register_extension_type (module, peas_object_module_register_extension_type (module,
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/org/gnome/builder/plugins/beautifier_plugin"> <gresource prefix="/org/gnome/builder/plugins/beautifier_plugin">
<file>gtk/menus.ui</file> <file>gtk/menus.ui</file>
</gresource> </gresource>
</gresources> </gresources>
...@@ -19,9 +19,24 @@ beautifier_sources = [ ...@@ -19,9 +19,24 @@ beautifier_sources = [
'gb-beautifier-editor-addin.h', 'gb-beautifier-editor-addin.h',
] ]
gnome_builder_plugins_sources += files(beautifier_sources) shared_module('beautifier_plugin', beautifier_sources,
gnome_builder_plugins_sources += beautifier_resources[0] 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,
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
beautifier_datadir = join_paths(get_option('prefix'), plugindatadir, 'beautifier_plugin') beautifier_datadir = join_paths(get_option('prefix'), plugindatadir, 'beautifier_plugin')
install_subdir('beautifier_plugin/data', install_dir: beautifier_datadir) install_subdir('beautifier_plugin/data', install_dir: beautifier_datadir)
install_subdir('beautifier_plugin/internal', install_dir: beautifier_datadir) install_subdir('beautifier_plugin/internal', install_dir: beautifier_datadir)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment