[epiphany/wip/autocrap: 21/27] Modernize appdata generation and validate it during distcheck
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/wip/autocrap: 21/27] Modernize appdata generation and validate it during distcheck
- Date: Mon, 29 Jun 2015 23:45:52 +0000 (UTC)
commit b844ea40d988aa465ef9d3b3705eda5d26b53230
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon Jun 29 18:08:28 2015 -0500
Modernize appdata generation and validate it during distcheck
Using the standard appstream macros that replaced the appdata macros
that replaced the do-it-manually method we have here.
configure.ac | 1 +
data/Makefile.am | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fec5b4a..f417c1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ AM_MAINTAINER_MODE([enable])
LT_PREREQ([2.2])
LT_INIT([dlopen disable-static])
+APPSTREAM_XML
GLIB_GSETTINGS
YELP_HELP_INIT
diff --git a/data/Makefile.am b/data/Makefile.am
index 1ad3ffa..6804e1c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,8 +17,9 @@ gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h
gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml
@GSETTINGS_RULES@
-appdatadir = $(datadir)/appdata
-appdata_DATA = epiphany.appdata.xml
+appstream_in_files = epiphany.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
aboutdialogdir = $(pkgdatadir)
aboutdialog_DATA = about.ini
@@ -54,9 +55,11 @@ $(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile $(INTLTOOL_MER
searchproviderdir = $(datadir)/gnome-shell/search-providers
dist_searchprovider_DATA = epiphany-search-provider.ini
+DISTCHECK_CONFIGURE_FLAGS == --enable-appdata-check
+
EXTRA_DIST = \
$(aboutdialog_DATA) \
- $(appdata_DATA).in \
+ $(appstream_in_files) \
$(service_in_files) \
$(desktop_in_files) \
$(about_DATA) \
@@ -70,7 +73,7 @@ EXTRA_DIST = \
check-mime.py
DISTCLEANFILES = \
- $(appdata_DATA) \
+ $(appstream_XML) \
$(service_DATA) \
$(desktop_DATA) \
$(default_bookmarks_DATA)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]