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

[Richard Hughes <rhughes src gnome org>]

commit 4d244f82d761d2c29e04be5e80682f283ee0f1e0
Author: Richard Hughes <richard hughsie com>
Date:   Wed Nov 30 17:04:31 2016 +0000

    f

 RELEASE         |    2 +-
 man/meson.build |    2 +-
 meson.build     |   10 +++++++---
 po/meson.build  |   26 +++++++++++++++++++++++++-
 src/meson.build |    9 ++++++---
 5 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/RELEASE b/RELEASE
index ca990fc..bcea6ac 100644
--- a/RELEASE
+++ b/RELEASE
@@ -3,7 +3,7 @@ Follow http://developer.gnome.org/dotplan/for_maintainers.html
 git log --format="%s" GNOME_POWER_MANAGER_3_22_2.. | grep -i -v trivial | grep -v Merge | uniq
 Add any user visible changes into data/appdata/org.gnome.PowerStats.appdata.xml.in
 
-Run "make distcheck", correct any problems encountered
+Run "ninja dist"
 
 git commit -a -m "GNOME Power Manager 3.22.3"
 git tag -s GNOME_POWER_MANAGER_3_22_3 -m "==== Version 3.22.3 ===="
diff --git a/man/meson.build b/man/meson.build
index 12207a4..24c33e6 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -4,7 +4,7 @@
 
 docbook2man = find_program('docbook2man', required : false)
 if docbook2man.found()
-  custom_target('xxxStatsManPage',
+  custom_target('gnome-power-statistics-man',
     output : 'gnome-power-statistics.1',
     input : 'gnome-power-statistics.sgml',
     command : [docbook2man, '@INPUT@', '--output', 'man'],
diff --git a/meson.build b/meson.build
index ee44f4d..85712fb 100644
--- a/meson.build
+++ b/meson.build
@@ -95,9 +95,13 @@ subdir('data')
 archiver = find_program('git', required : false)
 if archiver.found()
   run_target('dist',
-             command: ['git', 'archive', '--prefix=appstream-glib/',
+             # git config tar.tar.xz.command "xz -c"
+             command: ['git', 'archive',
+                       '--prefix=' + meson.project_name() + '/',
                        'HEAD',
-                       '--output', 'gnome-power-manager-' + meson.project_version() + '.tar.gz']
+                       '--format=tar.xz',
+                       '--output',
+                       meson.project_name() + '-' + meson.project_version() + '.tar.xz']
   )
 else
   message('git not found, you will not be able to run `ninja dist`')
@@ -105,7 +109,7 @@ endif
 
 appstream_util = find_program('appstream-util', required : false)
 if appstream_util.found()
-  custom_target('xxxNEWSnotsurewhattoputhere',
+  custom_target('NEWS',
     output : 'NEWS',
     input : 'data/appdata/org.gnome.PowerStats.appdata.xml.in',
     command : [appstream_util, 'appdata-to-news', '@INPUT@', '--output', '@OUTPUT@']
diff --git a/po/meson.build b/po/meson.build
index 99edcee..9994239 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -86,4 +86,28 @@ langs = [
   'zh_TW'
   ]
 
-i18n.gettext('gnome-power-manager', languages : langs)
+i18n.gettext(meson.project_name(),
+             languages : langs,
+             args: [
+               '--default-domain=' + meson.project_name(),
+               '--from-code=UTF-8',
+               '--add-comments',
+
+               '--keyword=_',
+               '--keyword=N_',
+               '--keyword=C_:1c,2',
+               '--keyword=NC_:1c,2',
+               '--keyword=g_dcgettext:2',
+               '--keyword=g_dngettext:2,3',
+               '--keyword=g_dpgettext2:2c,3',
+
+               '--flag=N_:1:pass-c-format',
+               '--flag=C_:2:pass-c-format',
+               '--flag=NC_:2:pass-c-format',
+               '--flag=g_dngettext:2:pass-c-format',
+               '--flag=g_strdup_printf:1:c-format',
+               '--flag=g_string_printf:2:c-format',
+               '--flag=g_string_append_printf:2:c-format',
+               '--flag=g_error_new:3:c-format',
+               '--flag=g_set_error:4:c-format',
+             ])
diff --git a/src/meson.build b/src/meson.build
index 8253c87..01987e0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,14 +4,15 @@
 
 cargs = ['-DG_LOG_DOMAIN="Gpm"']
 
-simple_resources = gnome.compile_resources('simple-resources',
+gnome_power_statistics_resources = gnome.compile_resources(
+  'gnome-power-statistics-resources',
   'gnome-power-manager.gresource.xml',
   source_dir : '.',
   c_name : 'gpm')
 
 gnome_power_statistics = executable(
   'gnome-power-statistics',
-  simple_resources,
+  gnome_power_statistics_resources,
   sources : [
     'gpm-array-float.c',
     'gpm-array-float.h',
@@ -25,7 +26,9 @@ gnome_power_statistics = executable(
     include_directories('@0@/..'.format(meson.current_build_dir())),
   ],
   dependencies : [gtk, gdk, cairo, upower, libm],
-  c_args : cargs
+  c_args : cargs,
+  install : true,
+  install_dir : 'bin'
 )
 
 if get_option('enable-tests')