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,49 +0,0 @@
|
||||
desktopdir = $(datadir)/applications
|
||||
desktop_in_files = xed.desktop.in
|
||||
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
@INTLTOOL_XML_RULE@
|
||||
|
||||
appdatadir = $(datadir)/appdata
|
||||
appdata_in_files = xed.appdata.xml.in
|
||||
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
|
||||
|
||||
gsettings_SCHEMAS = org.x.editor.gschema.xml
|
||||
|
||||
@GSETTINGS_RULES@
|
||||
|
||||
servicedir = $(datadir)/dbus-1/services
|
||||
service_in_files = org.x.editor.service.in
|
||||
service_DATA = $(service_in_files:.service.in=.service)
|
||||
|
||||
$(service_DATA): $(service_in_files) Makefile
|
||||
@sed -e "s|\@bindir\@|$(bindir)|" $<> $@
|
||||
|
||||
man_MANS = xed.1
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = xed.pc
|
||||
|
||||
bugreportdir = $(libexecdir)/xed
|
||||
bugreport_SCRIPTS = xed-bugreport.sh
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(appdata_in_files) \
|
||||
$(desktop_in_files) \
|
||||
$(service_in_files) \
|
||||
$(man_MANS) \
|
||||
xed.pc.in \
|
||||
xed-bugreport.sh.in
|
||||
|
||||
CLEANFILES = \
|
||||
$(desktop_DATA) \
|
||||
$(service_DATA) \
|
||||
$(gsettings_SCHEMAS) \
|
||||
$(pkgconfig_DATA) \
|
||||
$(appdata_DATA)
|
||||
|
||||
|
||||
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
42
data/meson.build
Normal file
42
data/meson.build
Normal file
@@ -0,0 +1,42 @@
|
||||
desktop = custom_target(
|
||||
'desktop',
|
||||
input: 'xed.desktop.in.in',
|
||||
output: 'xed.desktop',
|
||||
command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
|
||||
install: true,
|
||||
install_dir: desktopdir,
|
||||
)
|
||||
|
||||
appdata = custom_target(
|
||||
'appdata',
|
||||
input: 'xed.appdata.xml.in',
|
||||
output: 'xed.appdata.xml',
|
||||
command: [intltool_merge, '-x', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
|
||||
install: true,
|
||||
install_dir: join_paths(datadir, 'metainfo'),
|
||||
)
|
||||
|
||||
schema_conf = configuration_data()
|
||||
schema_conf.set('GETTEXT_PACKAGE', 'xed')
|
||||
|
||||
schema_file = configure_file(
|
||||
input: 'org.x.editor.gschema.xml.in',
|
||||
output: 'org.x.editor.gschema.xml',
|
||||
configuration: schema_conf,
|
||||
install_dir: join_paths(datadir, 'glib-2.0', 'schemas')
|
||||
)
|
||||
|
||||
service_conf = configuration_data()
|
||||
service_conf.set('bindir', join_paths(prefix, bindir))
|
||||
|
||||
configure_file(
|
||||
input: 'org.x.editor.service.in',
|
||||
output: 'org.x.editor.service',
|
||||
configuration: service_conf,
|
||||
install_dir: join_paths(datadir, 'dbus-1', 'services')
|
||||
)
|
||||
|
||||
install_data(
|
||||
'xed.1',
|
||||
install_dir : join_paths(get_option('prefix'), get_option('mandir'), 'man1')
|
||||
)
|
@@ -1,51 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
PKG_CONFIG_MODULES="glib-2.0 gtk+-3.0 gtksourceview-3.0 enchant iso-codes"
|
||||
|
||||
echo_padded ()
|
||||
{
|
||||
echo -n " - $1 "
|
||||
N=$(echo -n $1 | wc -m)
|
||||
while test $N -le 20
|
||||
do
|
||||
echo -n " "
|
||||
N=`expr $N + 1`
|
||||
done
|
||||
}
|
||||
|
||||
if (which gsettings >/dev/null)
|
||||
then
|
||||
echo "GSettings configuration dump:"
|
||||
gsettings list-recursively org.x.editor
|
||||
echo
|
||||
fi
|
||||
|
||||
echo "Active plugins:"
|
||||
gsettings get org.x.editor active-plugins \
|
||||
| sed -r -e 's/^\[(.*)\]$/\1/' -e 's/, /\n/g' \
|
||||
| sed -e 's/^.*$/ - \0/'
|
||||
echo
|
||||
|
||||
# Manually installed plugins (in $HOME)
|
||||
if [ -d $HOME/.config/xed/plugins ]
|
||||
then
|
||||
echo "Plugins in \$HOME:"
|
||||
ls $HOME/.config/xed/plugins/*.xed-plugin \
|
||||
| sed -r -e 's#.*/([^/]*)\.xed-plugin$# - \1#'
|
||||
else
|
||||
echo "No plugin installed in \$HOME."
|
||||
fi
|
||||
echo
|
||||
|
||||
echo "Module versions:"
|
||||
if (which pkg-config > /dev/null)
|
||||
then
|
||||
for i in $PKG_CONFIG_MODULES
|
||||
do
|
||||
echo_padded "`echo -n $i | sed -r -e 's/^(.*)-[0-9]\.[0-9]$/\1/'`"
|
||||
pkg-config --modversion $i 2>/dev/null || echo
|
||||
done
|
||||
else
|
||||
echo " pkg-config unavailable"
|
||||
fi
|
||||
echo
|
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
_Name=Text Editor
|
||||
_Comment=Edit text files
|
||||
Name=Text Editor
|
||||
Comment=Edit text files
|
||||
Exec=xed %U
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
@@ -1,12 +0,0 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
pluginsdir=@libdir@/xed/plugins
|
||||
|
||||
Name: xed
|
||||
Description: xed
|
||||
Requires: gtksourceview-3.0 libpeas-1.0 libpeas-gtk-1.0
|
||||
Version: @VERSION@
|
||||
Cflags: -I${includedir}/xed
|
||||
Libs: -L${libdir}
|
Reference in New Issue
Block a user