[gnome-builder: 2/139] appdata: move appdata files to subdirectory
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder: 2/139] appdata: move appdata files to subdirectory
- Date: Thu, 10 Jan 2019 04:17:29 +0000 (UTC)
commit e76d91ac00131ae45cace74cc053668d4c52e5e5
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 9 14:55:25 2019 -0800
appdata: move appdata files to subdirectory
data/appdata/meson.build | 17 +++++++++++++++++
data/{ => appdata}/org.gnome.Builder.appdata.xml.in | 0
data/meson.build | 19 +------------------
3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
new file mode 100644
index 000000000..8cb9668db
--- /dev/null
+++ b/data/appdata/meson.build
@@ -0,0 +1,17 @@
+# Appdata file.
+appdata_file = i18n.merge_file(
+ input: 'org.gnome.Builder.appdata.xml.in',
+ output: 'org.gnome.Builder.appdata.xml',
+ po_dir: '../po',
+ install: true,
+ install_dir: join_paths(get_option('datadir'), 'metainfo'),
+)
+
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+ validate_args = ['validate-relax', appdata_file]
+if not get_option('network_tests')
+ validate_args += '--nonet'
+endif
+ test('Validate appstream file', appstream_util, args: validate_args)
+endif
diff --git a/data/org.gnome.Builder.appdata.xml.in b/data/appdata/org.gnome.Builder.appdata.xml.in
similarity index 100%
rename from data/org.gnome.Builder.appdata.xml.in
rename to data/appdata/org.gnome.Builder.appdata.xml.in
diff --git a/data/meson.build b/data/meson.build
index 94e2bcb17..e0cb61d6e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,4 @@
+subdir('appdata')
# Desktop launcher and description file.
desktop_file = i18n.merge_file(
@@ -16,24 +17,6 @@ if desktop_utils.found()
)
endif
-# Appdata file.
-appdata_file = i18n.merge_file(
- input: 'org.gnome.Builder.appdata.xml.in',
- output: 'org.gnome.Builder.appdata.xml',
- po_dir: '../po',
- install: true,
- install_dir: join_paths(get_option('datadir'), 'metainfo'),
-)
-
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
- validate_args = ['validate-relax', appdata_file]
-if not get_option('network_tests')
- validate_args += '--nonet'
-endif
- test('Validate appstream file', appstream_util, args: validate_args)
-endif
-
# D-Bus service file.
dbusconf = configuration_data()
dbusconf.set('bindir', join_paths(get_option('prefix'), get_option('bindir')))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]