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,41 +0,0 @@
|
||||
# time plugin
|
||||
plugindir = $(XED_PLUGINS_LIBS_DIR)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(XED_CFLAGS) \
|
||||
$(WARN_CFLAGS) \
|
||||
$(DISABLE_DEPRECATED_CFLAGS)
|
||||
|
||||
plugin_LTLIBRARIES = libtime.la
|
||||
|
||||
libtime_la_SOURCES = \
|
||||
xed-time-plugin.h \
|
||||
xed-time-plugin.c
|
||||
|
||||
libtime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
|
||||
libtime_la_LIBADD = $(XED_LIBS)
|
||||
|
||||
uidir = $(XED_PLUGINS_DATA_DIR)/time
|
||||
ui_DATA = \
|
||||
xed-time-dialog.ui \
|
||||
xed-time-setup-dialog.ui
|
||||
|
||||
plugin_in_files = time.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@
|
||||
time_gschema_in = org.x.editor.plugins.time.gschema.xml.in
|
||||
gsettings_SCHEMAS = $(time_gschema_in:.xml.in=.xml)
|
||||
@GSETTINGS_RULES@
|
||||
|
||||
EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in)
|
||||
|
||||
CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn)
|
||||
DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
|
||||
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
55
plugins/time/meson.build
Normal file
55
plugins/time/meson.build
Normal file
@@ -0,0 +1,55 @@
|
||||
time_sources = [
|
||||
'xed-time-plugin.h',
|
||||
'xed-time-plugin.c'
|
||||
]
|
||||
|
||||
time_deps = [
|
||||
config_h,
|
||||
gio,
|
||||
glib,
|
||||
gtksourceview,
|
||||
libpeas,
|
||||
libpeas_gtk
|
||||
]
|
||||
|
||||
library(
|
||||
'time',
|
||||
time_sources,
|
||||
link_with: libxed,
|
||||
dependencies: time_deps,
|
||||
include_directories: include_dirs,
|
||||
install_rpath: join_paths(prefix, libdir, 'xed'),
|
||||
install: true,
|
||||
install_dir: join_paths(libdir, 'xed', 'plugins')
|
||||
)
|
||||
|
||||
time_ui_sources = [
|
||||
'xed-time-dialog.ui',
|
||||
'xed-time-setup-dialog.ui'
|
||||
]
|
||||
|
||||
install_data(
|
||||
time_ui_sources,
|
||||
install_dir: join_paths(pluginsdatadir, 'time')
|
||||
)
|
||||
|
||||
time_desktop = custom_target(
|
||||
'time_desktop',
|
||||
input: 'time.plugin.desktop.in',
|
||||
output: 'time.plugin',
|
||||
command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
|
||||
install: true,
|
||||
install_dir: pluginslibdir,
|
||||
)
|
||||
|
||||
time_schema_file = configure_file(
|
||||
input: 'org.x.editor.plugins.time.gschema.xml.in',
|
||||
output: 'org.x.editor.plugins.time.gschema.xml',
|
||||
configuration: schema_conf,
|
||||
install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
|
||||
)
|
||||
|
||||
install_data(
|
||||
time_schema_file,
|
||||
install_dir: schema_dir
|
||||
)
|
@@ -24,22 +24,18 @@
|
||||
* See the ChangeLog files for a list of changes.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <glib/gi18n-lib.h>
|
||||
#include <glib.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
#include <xed/xed-window.h>
|
||||
#include <xed/xed-window-activatable.h>
|
||||
#include <libpeas-gtk/peas-gtk-configurable.h>
|
||||
#include <xed/xed-debug.h>
|
||||
#include <xed/xed-utils.h>
|
||||
#include <xed/xed-app.h>
|
||||
|
||||
#include "xed-time-plugin.h"
|
||||
|
||||
#define XED_TIME_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
|
||||
|
Reference in New Issue
Block a user