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
This commit is contained in:
committed by
Clement Lefebvre
parent
39cadaa36e
commit
6e36dc4a5f
@@ -1,58 +0,0 @@
|
||||
# Spell checker plugin
|
||||
plugindir = $(XED_PLUGINS_LIBS_DIR)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(XED_CFLAGS) \
|
||||
$(GSPELL_CFLAGS) \
|
||||
$(WARN_CFLAGS) \
|
||||
$(DISABLE_DEPRECATED_CFLAGS)
|
||||
|
||||
BUILT_SOURCES = \
|
||||
xed-spell-marshal.c \
|
||||
xed-spell-marshal.h
|
||||
|
||||
plugin_LTLIBRARIES = libspell.la
|
||||
|
||||
libspell_la_SOURCES = \
|
||||
xed-spell-plugin.c \
|
||||
xed-spell-plugin.h \
|
||||
$(BUILT_SOURCES)
|
||||
|
||||
libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
|
||||
libspell_la_LIBADD = $(XED_LIBS) $(GSPELL_LIBS)
|
||||
|
||||
uidir = $(XED_PLUGINS_DATA_DIR)/spell
|
||||
ui_DATA = xed-spell-setup-dialog.ui
|
||||
|
||||
xed-spell-marshal.h: xed-spell-marshal.list $(GLIB_GENMARSHAL)
|
||||
$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=xed_marshal > $@
|
||||
|
||||
xed-spell-marshal.c: xed-spell-marshal.list $(GLIB_GENMARSHAL)
|
||||
$(AM_V_GEN) echo "#include \"xed-spell-marshal.h\"" > $@ && \
|
||||
$(GLIB_GENMARSHAL) $< --body --prefix=xed_marshal >> $@
|
||||
|
||||
plugin_in_files = spell.plugin.desktop.in
|
||||
|
||||
%.plugin: %.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:.plugin.desktop.in=.plugin)
|
||||
|
||||
@INTLTOOL_XML_NOMERGE_RULE@
|
||||
spell_gschema_in = org.x.editor.plugins.spell.gschema.xml.in
|
||||
gsettings_SCHEMAS = $(spell_gschema_in:.xml.in=.xml)
|
||||
@GSETTINGS_RULES@
|
||||
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(ui_DATA) \
|
||||
$(plugin_in_files) \
|
||||
xed-spell-marshal.list \
|
||||
$(spell_gschema_in)
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES) $(plugin_DATA) $(gsettings_SCHEMAS)
|
||||
|
||||
dist-hook:
|
||||
cd $(distdir); rm -f $(BUILT_SOURCES)
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
57
plugins/spell/meson.build
Normal file
57
plugins/spell/meson.build
Normal file
@@ -0,0 +1,57 @@
|
||||
spell_sources = [
|
||||
'xed-spell-plugin.c',
|
||||
'xed-spell-plugin.h'
|
||||
]
|
||||
|
||||
spell_marshal = gnome.genmarshal(
|
||||
'xed-spell-marshal',
|
||||
sources: 'xed-spell-marshal.list',
|
||||
prefix: 'xed_spell_marshal'
|
||||
)
|
||||
|
||||
spell_deps = [
|
||||
config_h,
|
||||
glib,
|
||||
gspell,
|
||||
gtksourceview,
|
||||
libpeas,
|
||||
libpeas_gtk
|
||||
]
|
||||
|
||||
library(
|
||||
'spell',
|
||||
spell_sources + spell_marshal,
|
||||
link_with: libxed,
|
||||
dependencies: spell_deps,
|
||||
include_directories: include_dirs,
|
||||
install_rpath: join_paths(prefix, libdir, 'xed'),
|
||||
install: true,
|
||||
install_dir: join_paths(libdir, 'xed', 'plugins')
|
||||
)
|
||||
|
||||
install_data(
|
||||
'xed-spell-setup-dialog.ui',
|
||||
install_dir: join_paths(pluginsdatadir, 'spell')
|
||||
)
|
||||
|
||||
spell_desktop = custom_target(
|
||||
'spell_desktop',
|
||||
input: 'spell.plugin.desktop.in',
|
||||
output: 'spell.plugin',
|
||||
command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
|
||||
install: true,
|
||||
install_dir: pluginslibdir,
|
||||
)
|
||||
|
||||
|
||||
spell_schema_file = configure_file(
|
||||
input: 'org.x.editor.plugins.spell.gschema.xml.in',
|
||||
output: 'org.x.editor.plugins.spell.gschema.xml',
|
||||
configuration: schema_conf,
|
||||
install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
|
||||
)
|
||||
|
||||
install_data(
|
||||
spell_schema_file,
|
||||
install_dir: schema_dir
|
||||
)
|
@@ -19,14 +19,9 @@
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "xed-spell-plugin.h"
|
||||
|
||||
#include <string.h> /* For strlen */
|
||||
|
||||
#include <glib/gi18n-lib.h>
|
||||
#include <libpeas-gtk/peas-gtk-configurable.h>
|
||||
|
||||
#include <xed/xed-app.h>
|
||||
#include <xed/xed-window.h>
|
||||
#include <xed/xed-window-activatable.h>
|
||||
@@ -34,6 +29,8 @@
|
||||
#include <xed/xed-utils.h>
|
||||
#include <gspell/gspell.h>
|
||||
|
||||
#include "xed-spell-plugin.h"
|
||||
|
||||
#define XED_METADATA_ATTRIBUTE_SPELL_LANGUAGE "metadata::xed-spell-language"
|
||||
#define XED_METADATA_ATTRIBUTE_SPELL_ENABLED "metadata::xed-spell-enabled"
|
||||
|
||||
|
Reference in New Issue
Block a user