[gnome-power-manager/wip/hughsie/meson] f

[Richard Hughes <rhughes src gnome org>]

commit 45a07d47754913153b2b2b8824b1b7e3c2e3e3ff
Author: Richard Hughes <richard hughsie com>
Date:   Thu Dec 1 11:18:14 2016 +0000

    f

 data/appdata/meson.build                           |   16 ++++++++----
 data/appdata/org.gnome.PowerStats.appdata.xml.in   |   12 ++++----
 data/meson.build                                   |   25 ++++++++++++++-----
 ...sktop.in => org.gnome.PowerStats.desktop.in.in} |    2 +-
 meson.build                                        |    9 +-----
 po/meson.build                                     |    2 +
 src/meson.build                                    |    5 ++-
 7 files changed, 43 insertions(+), 28 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index fcd0ab8..3b943dd 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -2,8 +2,14 @@
 #
 # Licensed under the GNU General Public License Version 2 or later
 
-# FIXME: needs to merge in translations!
-configure_file(input : 'org.gnome.PowerStats.appdata.xml.in',
-               output : 'org.gnome.PowerStats.appdata.xml',
-               install_dir : get_option('datadir') + '/appdata',
-               configuration : conf)
+# FIXME: Use i18n.merge_file when available
+msgfmt = find_program('msgfmt')
+podir = join_paths(meson.source_root(), 'po')
+custom_target('appdata-file',
+              input: 'org.gnome.PowerStats.appdata.xml.in',
+              output: 'org.gnome.PowerStats.appdata.xml',
+              install: true,
+              install_dir: join_paths(get_option('datadir'), 'appdata'),
+              command: [
+                msgfmt, '--xml', '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@'
+              ])
diff --git a/data/appdata/org.gnome.PowerStats.appdata.xml.in 
b/data/appdata/org.gnome.PowerStats.appdata.xml.in
index 3b44be7..185fbc4 100644
--- a/data/appdata/org.gnome.PowerStats.appdata.xml.in
+++ b/data/appdata/org.gnome.PowerStats.appdata.xml.in
@@ -4,18 +4,18 @@
   <id>org.gnome.PowerStats.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and GFDL-1.3</project_license>
-  <_name>GNOME Power Statistics</_name>
-  <_summary>Observe power management</_summary>
+  <name>GNOME Power Statistics</name>
+  <summary>Observe power management</summary>
   <description>
-    <_p>
+    <p>
       Power Statistics can show historical and current battery information and
       programs waking up that use power.
-    </_p>
-    <_p>
+    </p>
+    <p>
       You probably only need to install this application if you are having
       problems with your laptop battery, or are trying to work out what programs
       are using significant amounts of power.
-    </_p>
+    </p>
   </description>
   <screenshots>
     <screenshot type="default">
diff --git a/data/meson.build b/data/meson.build
index 1df854d..7de22b9 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,15 +2,26 @@
 #
 # Licensed under the GNU General Public License Version 2 or later
 
+subdir('appdata')
+subdir('icons')
+
 compiled = gnome.compile_schemas()
 install_data('org.gnome.power-manager.gschema.xml',
              install_dir : 'share/glib-2.0/schemas')
 
-# FIXME: needs to merge in translations!
-configure_file(input : 'org.gnome.PowerStats.desktop.in',
-               output : 'org.gnome.PowerStats.desktop',
-               install_dir : get_option('datadir') + '/applications',
-               configuration : conf)
+# replace @VERSION@
+versionedfile = configure_file(input : 'org.gnome.PowerStats.desktop.in.in',
+                               output : 'org.gnome.PowerStats.desktop.in',
+                               configuration : conf)
 
-subdir('appdata')
-subdir('icons')
+# FIXME: Use i18n.merge_file when available
+msgfmt = find_program('msgfmt')
+podir = join_paths(meson.source_root(), 'po')
+custom_target('desktop-file',
+              input: versionedfile,
+              output: 'org.gnome.PowerStats.desktop',
+              install: true,
+              install_dir: join_paths(get_option('datadir'), 'applications'),
+              command: [
+                msgfmt, '--desktop', '--template', '@INPUT@', '-d', podir, '-o', '@OUTPUT@'
+              ])
diff --git a/data/org.gnome.PowerStats.desktop.in b/data/org.gnome.PowerStats.desktop.in.in
similarity index 91%
rename from data/org.gnome.PowerStats.desktop.in
rename to data/org.gnome.PowerStats.desktop.in.in
index 5455565..e6653e4 100644
--- a/data/org.gnome.PowerStats.desktop.in
+++ b/data/org.gnome.PowerStats.desktop.in.in
@@ -12,5 +12,5 @@ StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-power-manager
 X-GNOME-Bugzilla-Component=gnome-power-statistics
-X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Bugzilla-Version=@PACKAGE_VERSION@
 X-Desktop-File-Install-Version=0.10
diff --git a/meson.build b/meson.build
index 6ba714d..d6c41ce 100644
--- a/meson.build
+++ b/meson.build
@@ -69,12 +69,6 @@ cairo = dependency('cairo', version : '>= 1.0.0')
 upower = dependency('upower-glib', version : '>= 0.9.1')
 libm = cc.find_library('libm', required: false)
 
-# use gperf for faster string -> enum matching
-docbook2man = find_program('docbook2man', required : false)
-if docbook2man.found()
-  conf.set('HAVE_DOCBOOK2MAN', 1)
-endif
-
 gnome = import('gnome')
 i18n = import('i18n')
 
@@ -112,6 +106,7 @@ if appstream_util.found()
   custom_target('NEWS',
     output : 'NEWS',
     input : 'data/appdata/org.gnome.PowerStats.appdata.xml.in',
-    command : [appstream_util, 'appdata-to-news', '@INPUT@', '--output', '@OUTPUT@']
+    command : [appstream_util, 'appdata-to-news', '@INPUT@'],
+    capture : true
   )
 endif
diff --git a/po/meson.build b/po/meson.build
index 9994239..a0fb4a8 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -2,6 +2,7 @@
 #
 # Licensed under the GNU General Public License Version 2 or later
 
+# FIXME : get from LINGUAS
 langs = [
   'af',
   'ar',
@@ -86,6 +87,7 @@ langs = [
   'zh_TW'
   ]
 
+# FIXME: remove a lot of copy-paste: https://github.com/mesonbuild/meson/issues/1123
 i18n.gettext(meson.project_name(),
              languages : langs,
              args: [
diff --git a/src/meson.build b/src/meson.build
index 01987e0..b4bf1cd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,7 +10,7 @@ gnome_power_statistics_resources = gnome.compile_resources(
   source_dir : '.',
   c_name : 'gpm')
 
-gnome_power_statistics = executable(
+executable(
   'gnome-power-statistics',
   gnome_power_statistics_resources,
   sources : [
@@ -32,7 +32,7 @@ gnome_power_statistics = executable(
 )
 
 if get_option('enable-tests')
-  gnome_power_self_test = executable(
+  e = executable(
     'gnome-power-self-test',
     sources : [
       'gpm-array-float.c',
@@ -45,4 +45,5 @@ if get_option('enable-tests')
     dependencies : [gtk, gdk, cairo, upower, libm],
     c_args : cargs
   )
+  test('gnome-power-self-test', e)
 endif