Port to meson (#258)

* Port to meson * plugin generation script: swtich to meson, update to python3, switch to libpeas, add some extra options, and cleanup * clean up some build warnings * kill xed-bugreport.sh with fire: it isn't used anymore, and probably doesn't even work * update gzip command to avoid warnings on some systems and move appdata.xml to /usr/share/metainfo/ as that's where it's supposed to go now * POTFILES.in: fix path that changed in the meson port, which was causing makepot to fail
2018-11-19 04:09:52 -07:00
parent 39cadaa36e
commit 6e36dc4a5f
117 changed files with 1284 additions and 1910 deletions
--- a/tools/plugin_template/Makefile.am
+++ b/tools/plugin_template/Makefile.am
@@ -1,37 +0,0 @@
-# ##(PLUGIN_NAME)
-
-plugindir = $(XED_PLUGINS_LIBS_DIR)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 						\
-	$(XED_CFLAGS) 						\
-	$(WARN_CFLAGS)							\
-	$(DISABLE_DEPRECATED_CFLAGS)					\
-	-DXED_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-plugin_LTLIBRARIES = lib##(PLUGIN_MODULE).la
-
-lib##(PLUGIN_MODULE)_la_SOURCES = \
-	##(PLUGIN_MODULE)-plugin.h	\
-	##(PLUGIN_MODULE)-plugin.c
-
-lib##(PLUGIN_MODULE)_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-lib##(PLUGIN_MODULE)_la_LIBADD  = $(XED_LIBS)
-
-# UI files (if you use gtkbuilder for your plugin, list those files here)
-uidir = $(XED_PLUGINS_DATA_DIR)/##(PLUGIN_MODULE)
-ui_DATA =
-
-plugin_in_files = ##(PLUGIN_MODULE).xed-plugin.desktop.in
-
-%.xed-plugin: %.xed-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.xed-plugin.desktop.in=.xed-plugin)
-
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA) $(ui_DATA)
-
-DISTCLEANFILES = $(plugin_DATA) $(ui_DATA)
-
-include $(top_srcdir)/git.mk
--- a/tools/plugin_template/meson.build
+++ b/tools/plugin_template/meson.build
@@ -0,0 +1,34 @@
+##ifdef HAS_C_FILES
+##(PLUGIN_ID.lower)_sources = [
+    xed-##(PLUGIN_MODULE.lower)-plugin.h
+    xed-##(PLUGIN_MODULE.lower)-plugin.c,
+]
+
+##(PLUGIN_ID.lower)_deps = [
+    config_h,
+    glib,
+    gtksourceview,
+    libpeas,
+    libpeas_gtk
+]
+
+library(
+    '##(PLUGIN_ID.lower)',
+    ##(PLUGIN_ID.lower)_sources,
+    link_with: libxed,
+    dependencies: ##(PLUGIN_ID.lower)_deps,
+    include_directories: include_dirs,
+    install_rpath: join_paths(prefix, libdir, 'xed'),
+    install: true,
+    install_dir: join_paths(libdir, 'xed', 'plugins')
+)
+
+##endif
+##(PLUGIN_ID.lower)_desktop = custom_target(
+    '##(PLUGIN_ID)_desktop',
+    input: '##(PLUGIN_ID).plugin.desktop.in',
+    output: '##(PLUGIN_ID).plugin',
+    command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: pluginslibdir,
+)
--- a/tools/plugin_template/xed-plugin.c
+++ b/tools/plugin_template/xed-plugin.c
@@ -7,7 +7,7 @@
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
- * 
+ *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -18,167 +18,185 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#include "##(PLUGIN_MODULE)-plugin.h"
-
 #include <glib/gi18n-lib.h>
 #include <xed/xed-debug.h>

-#define WINDOW_DATA_KEY	"##(PLUGIN_ID.camel)PluginWindowData"
-
-#define ##(PLUGIN_ID.upper)_PLUGIN_GET_PRIVATE(object)	(G_TYPE_INSTANCE_GET_PRIVATE ((object), TYPE_##(PLUGIN_ID.upper)_PLUGIN, ##(PLUGIN_ID.camel)PluginPrivate))
+#include "##(PLUGIN_MODULE)-plugin.h"

 struct _##(PLUGIN_ID.camel)PluginPrivate
 {
-	gpointer dummy;
+    gpointer dummy;
+
+##ifdef WITH_MENU
+    GtkActionGroup *action_group;
+    guint           ui_id;
+##endif
 };

-XED_PLUGIN_REGISTER_TYPE (##(PLUGIN_ID.camel)Plugin, ##(PLUGIN_ID.lower)_plugin)
+struct _##(PLUGIN_ID.camel)Plugin
+{
+    PeasExtensionBase;
+};
+
+static void peas_activatable_iface_init (PeasActivatableInterface *iface);
+static void peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface);
+
+G_DEFINE_TYPE_WITH_PRIVATE (##(PLUGIN_ID.camel)Plugin, ##(PLUGIN_ID.lower)_plugin, PeasExtensionBase)

 ##ifdef WITH_MENU
 /* UI string. See xed-ui.xml for reference */
-static const gchar ui_str = 
-	"<ui>"
-	"  <menubar name='MenuBar'>"
-	"    <!-- Put your menu entries here -->"
-	"  </menubar>"
-	"</ui>";
+static const gchar ui_str =
+    "<ui>"
+    "  <menubar name='MenuBar'>"
+    "    <!-- Put your menu entries here -->"
+    "  </menubar>"
+    "</ui>";

 /* UI actions */
 static const GtkActionEntry action_entries[] =
-	{
-		/* Put your actions here */
-	};
+    {
+        /* Put your actions here */
+    };

-typedef struct
-{
-	GtkActionGroup *action_group;
-	guint           ui_id;
-} WindowData;
 ##endif

 static void
 ##(PLUGIN_ID.lower)_plugin_init (##(PLUGIN_ID.camel)Plugin *plugin)
 {
-	plugin->priv = ##(PLUGIN_ID.upper)_PLUGIN_GET_PRIVATE (plugin);
+    plugin->priv = ##(PLUGIN_ID.upper)_PLUGIN_GET_PRIVATE (plugin);

-	xed_debug_message (DEBUG_PLUGINS,
-			     "##(PLUGIN_ID.camel)Plugin initializing");
+    xed_debug_message (DEBUG_PLUGINS, "##(PLUGIN_ID.camel)Plugin initializing");
 }

 static void
 ##(PLUGIN_ID.lower)_plugin_finalize (GObject *object)
 {
-	xed_debug_message (DEBUG_PLUGINS,
-			     "##(PLUGIN_ID.camel)Plugin finalizing");
+    xed_debug_message (DEBUG_PLUGINS, "##(PLUGIN_ID.camel)Plugin finalizing");

-	G_OBJECT_CLASS (##(PLUGIN_ID.lower)_plugin_parent_class)->finalize (object);
+    G_OBJECT_CLASS (##(PLUGIN_ID.lower)_plugin_parent_class)->finalize (object);
 }

-##ifdef WITH_MENU
 static void
-free_window_data (WindowData *data)
+##(PLUGIN_ID.lower)_plugin_dispose (GObject *object)
 {
-	g_return_if_fail (data != NULL);
+    ##(PLUGIN_ID.camelPlugin *plugin = ##(PLUGIN_ID.upper)_PLUGIN (object);
+    xed_debug_message (DEBUG_PLUGINS, "##(PLUGIN_ID.camel)Plugin disposing");
+    if (plugin->priv->window != NULL)
+    {
+        g_object_unref (plugin->priv->window);
+        plugin->priv->window = NULL;
+    }
+    if (plugin->priv->action_group)
+    {
+        g_object_unref (plugin->priv->action_group);
+        plugin->priv->action_group = NULL;
+    }

-	g_object_unref (data->action_group);
-	g_free (data);
+    G_OBJECT_CLASS (##(PLUGIN_ID.lower)_plugin_parent_class)->dispose (object);
 }
+
+static void
+##(PLUGIN_ID.lower)_plugin_activate (PeasActivatable *activatable)
+{
+##ifdef WITH_MENU
+    ##(PLUGIN_ID.camel)Plugin *plugin;
+    ##(PLUGIN_ID.camel)PluginPrivate *data;
+    XedWindow *window;
+    GtkUIManager *manager;
 ##endif

-static void
-impl_activate (XedPlugin *plugin,
-	       XedWindow *window)
-{
-##ifdef WITH_MENU
-	GtkUIManager *manager;
-	WindowData *data;
-##endif	
-
-	xed_debug (DEBUG_PLUGINS);
+    xed_debug (DEBUG_PLUGINS);

 ##ifdef WITH_MENU
-	data = g_new (WindowData, 1);
-	manager = xed_window_get_ui_manager (window);
+    plugin = ##(PLUGIN_ID.upper)_PLUGIN (activatable);
+    data = plugin->priv;
+    window = XED_WINDOW (data->window);

-	data->action_group = gtk_action_group_new ("##(PLUGIN_ID.camel)PluginActions");
-	gtk_action_group_set_translation_domain (data->action_group,
-						 GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (data->action_group,
-				      action_entries,
-				      G_N_ELEMENTS (action_entries),
-				      window);
+    manager = xed_window_get_ui_manager (window);

-	gtk_ui_manager_insert_action_group (manager, data->action_group, -1);
+    data->action_group = gtk_action_group_new ("##(PLUGIN_ID.camel)PluginActions");
+    gtk_action_group_set_translation_domain (data->action_group,
+                                             GETTEXT_PACKAGE);
+    gtk_action_group_add_actions (data->action_group,
+                                  action_entries,
+                                  G_N_ELEMENTS (action_entries),
+                                  window);

-	data->ui_id = gtk_ui_manager_add_ui_from_string (manager, ui_str,
-							 -1, NULL);
+    gtk_ui_manager_insert_action_group (manager, data->action_group, -1);

-	g_object_set_data_full (G_OBJECT (window), 
-				WINDOW_DATA_KEY, 
-				data,
-				(GDestroyNotify) free_window_data);
-##endif	
-}
-
-static void
-impl_deactivate (XedPlugin *plugin,
-		 XedWindow *window)
-{
-##ifdef WITH_MENU
-	GtkUIManager *manager;
-	WindowData *data;
-##endif
-
-	xed_debug (DEBUG_PLUGINS);
-
-##ifdef WITH_MENU
-	manager = xed_window_get_ui_manager (window);
-
-	data = (WindowData *) g_object_get_data (G_OBJECT (window),
-						 WINDOW_DATA_KEY);
-	g_return_if_fail (data != NULL);
-
-	gtk_ui_manager_remove_ui (manager, data->ui_id);
-	gtk_ui_manager_remove_action_group (manager, data->action_group);
-
-	g_object_set_data (G_OBJECT (window), WINDOW_DATA_KEY, NULL);
+    data->ui_id = gtk_ui_manager_add_ui_from_string (manager, ui_str,
+                                                     -1, NULL);
 ##endif
 }

 static void
-impl_update_ui (XedPlugin *plugin,
-		XedWindow *window)
+##(PLUGIN_ID.lower)_plugin_deactivate (PeasActivatable *activatable)
 {
-	xed_debug (DEBUG_PLUGINS);
+##ifdef WITH_MENU
+    ##(PLUGIN_ID.camel)PluginPrivate *data;
+    XedWindow *window;
+    GtkUIManager *manager;
+##endif
+
+    xed_debug (DEBUG_PLUGINS);
+
+##ifdef WITH_MENU
+    data = ##(PLUGIN_ID.upper)_PLUGIN (activatable)->priv;
+    window = XED_WINDOW (data->window);
+
+    manager = xed_window_get_ui_manager (window);
+
+    data = (WindowData *) g_object_get_data (G_OBJECT (window),
+                         WINDOW_DATA_KEY);
+    g_return_if_fail (data != NULL);
+
+    gtk_ui_manager_remove_ui (manager, data->ui_id);
+    gtk_ui_manager_remove_action_group (manager, data->action_group);
+##endif
+}
+
+static void
+##(PLUGIN_ID.lower)_plugin_update_state (PeasActivatable *activatable)
+{
+    xed_debug (DEBUG_PLUGINS);
+}
+
+static void
+peas_activatable_iface_init (PeasActivatableInterface *iface)
+{
+    iface->activate = ##(PLUGIN_ID.lower)_plugin_activate;
+    iface->deactivate = ##(PLUGIN_ID.lower)_plugin_deactivate;
+    iface->update_state = ##(PLUGIN_ID.lower)_plugin_update_state;
 }

 ##ifdef WITH_CONFIGURE_DIALOG
-static GtkWidget *
-impl_create_configure_dialog (XedPlugin *plugin)
+static void
+peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface)
 {
-	xed_debug (DEBUG_PLUGINS);
+    iface->create_configure_widget = xed_time_plugin_create_configure_widget;
 }
 ##endif

 static void
 ##(PLUGIN_ID.lower)_plugin_class_init (##(PLUGIN_ID.camel)PluginClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    XedPluginClass *plugin_class = XED_PLUGIN_CLASS (klass);

-	object_class->finalize = ##(PLUGIN_ID.lower)_plugin_finalize;
-
-	plugin_class->activate = impl_activate;
-	plugin_class->deactivate = impl_deactivate;
-	plugin_class->update_ui = impl_update_ui;
-##ifdef WITH_CONFIGURE_DIALOG
-	plugin_class->create_configure_dialog = impl_create_configure_dialog;
-##endif
-
-	g_type_class_add_private (object_class, 
-				  sizeof (##(PLUGIN_ID.camel)PluginPrivate));
+    object_class->finalize = ##(PLUGIN_ID.lower)_plugin_finalize;
+    object_class->dispose = ##(PLUGIN_ID.lower)_plugin_dispose;
+}
+
+G_MODULE_EXPORT void
+peas_register_types (PeasObjectModule *module)
+{
+    ##(PLUGIN_ID.lower)_plugin_register_type (G_TYPE_MODULE (module));
+    peas_object_module_register_extension_type (module,
+                                                PEAS_TYPE_ACTIVATABLE,
+                                                ##(PLUGIN_ID.lower)_TYPE_PLUGIN);
+
+    peas_object_module_register_extension_type (module,
+                                                PEAS_GTK_TYPE_CONFIGURABLE,
+                                                ##(PLUGIN_ID.lower)_TYPE_PLUGIN);
 }
--- a/tools/plugin_template/xed-plugin.h
+++ b/tools/plugin_template/xed-plugin.h
@@ -23,53 +23,16 @@

 #include <glib.h>
 #include <glib-object.h>
-#include <xed/xed-plugin.h>
+#include <libpeas/peas-extension-base.h>
+#include <libpeas/peas-object-module.h>

 G_BEGIN_DECLS

-/*
- * Type checking and casting macros
- */
-#define TYPE_##(PLUGIN_ID.upper)_PLUGIN		(##(PLUGIN_ID.lower)_plugin_get_type ())
-#define ##(PLUGIN_ID.upper)_PLUGIN(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_##(PLUGIN_ID.upper)_PLUGIN, ##(PLUGIN_ID.camel)Plugin))
-#define ##(PLUGIN_ID.upper)_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), TYPE_##(PLUGIN_ID.upper)_PLUGIN, ##(PLUGIN_ID.camel)PluginClass))
-#define IS_##(PLUGIN_ID.upper)_PLUGIN(o)	(G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_##(PLUGIN_ID.upper)_PLUGIN))
-#define IS_##(PLUGIN_ID.upper)_PLUGIN_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_##(PLUGIN_ID.upper)_PLUGIN))
-#define ##(PLUGIN_ID.upper)_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_##(PLUGIN_ID.upper)_PLUGIN, ##(PLUGIN_ID.camel)PluginClass))
-
-/* Private structure type */
-typedef struct _##(PLUGIN_ID.camel)PluginPrivate	##(PLUGIN_ID.camel)PluginPrivate;
-
-/*
- * Main object structure
- */
-typedef struct _##(PLUGIN_ID.camel)Plugin		##(PLUGIN_ID.camel)Plugin;
-
-struct _##(PLUGIN_ID.camel)Plugin
-{
-	XedPlugin parent_instance;
-
-	/*< private >*/
-	##(PLUGIN_ID.camel)PluginPrivate *priv;
-};
-
-/*
- * Class definition
- */
-typedef struct _##(PLUGIN_ID.camel)PluginClass	##(PLUGIN_ID.camel)PluginClass;
-
-struct _##(PLUGIN_ID.camel)PluginClass
-{
-	XedPluginClass parent_class;
-};
-
-/*
- * Public methods
- */
-GType	##(PLUGIN_ID.lower)_plugin_get_type	(void) G_GNUC_CONST;
+#define ##(PLUGIN_ID.upper)_TYPE_PLUGIN     (##(PLUGIN_ID.lower)_plugin_get_type ())
+G_DECLARE_FINAL_TYPE (##(PLUGIN_ID.camel)Plugin, ##(PLUGIN_ID.lower)_plugin, ##(PLUGIN_ID.upper), PLUGIN, PeasExtensionBase)

 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_xed_plugin (GTypeModule *module);
+G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);

 G_END_DECLS