Fix make dist

Fix make dist

'make dist' has different directories between builddir and srcdir.

src/tests/runtest gets the builddir of ibus-memconf from the
srcdir of memconf.xml and the builddir of ibus-engine-simple
from the srcdir of simple.xml.

bindings/pygobject/test-override-ibus.py runs IBus.Keymap.new()
and gets the path of keymaps from IBUS_KEYMAP_PATH variable.

bindings/vala/ibus-1.0.vapi needs to be cleaned by 'make distclean'.

R=shawn.p.huang@gmail.com

Committed: eee7a132d686cb8d9c36c632523649745487b503

[shawn.p.huang_gmail.com, 2016-07-26 12:47:40]

lgtm

<takao.fujiwara1@gmail.com>于2016年7月26日周二 上午7:05写道：

> Reviewers: shawn.p.huang_gmail.com,
>
> Description:
> Fix make dist
>
> 'make dist' has different directories between builddir and srcdir.
>
> src/tests/runtest gets the builddir of ibus-memconf from the
> srcdir of memconf.xml and the builddir of ibus-engine-simple
> from the srcdir of simple.xml.
>
> bindings/pygobject/test-override-ibus.py runs IBus.Keymap.new()
> and gets the path of keymaps from IBUS_KEYMAP_PATH variable.
>
> bindings/vala/ibus-1.0.vapi needs to be cleaned by 'make distclean'.
>
> Please review this at https://codereview.appspot.com/305950043/
>
> Affected files (+17, -6 lines):
>    M Makefile.am
>    M bindings/pygobject/Makefile.am
>    M bindings/vala/Makefile.am
>    M src/ibuskeymap.c
>    M src/tests/runtest
>
>
> Index: Makefile.am
> diff --git a/Makefile.am b/Makefile.am
> index
>
>
425d1ec2f93156780569b769b61be505b52d85fe..38515c6773008a5500236b8516ad88df109b5946
> 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -90,7 +90,6 @@ install-data-hook:
>   DISTCHECK_CONFIGURE_FLAGS = \
>         --enable-gtk-doc \
>         --disable-schemas-install \
> -       --disable-introspection \
>         $(NULL)
>
>   dist-hook:
> Index: bindings/pygobject/Makefile.am
> diff --git a/bindings/pygobject/Makefile.am
> b/bindings/pygobject/Makefile.am
> index
>
>
53b36ef3e9bdd2c6665b9dedeb1745d410cb614f..238a537afec0278d960308c637cbb46541df3518
> 100644
> --- a/bindings/pygobject/Makefile.am
> +++ b/bindings/pygobject/Makefile.am
> @@ -3,7 +3,7 @@
>   # ibus - The Input Bus
>   #
>   # Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
> -# Copyright (c) 2014 Peng Huang <shawn.p.huang@gmail.com>
> +# Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
>   #
>   # This library is free software; you can redistribute it and/or
>   # modify it under the terms of the GNU Lesser General Public
> @@ -39,10 +39,12 @@ if ENABLE_TESTS
>   TESTS += test-override-ibus.py
>   endif
>
> +# IBus.Keymap() accesses keymap files
>   TESTS_ENVIRONMENT = \
>         PYTHONPATH=$(top_srcdir)/tests:$${PYTHONPATH:+:$$PYTHONPATH} \
>         LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH \
>         GI_TYPELIB_PATH=$(top_builddir)/src:$$GI_TYPELIB_PATH \
> +       IBUS_KEYMAP_PATH=$(top_srcdir)/data/keymaps \
>         $(NULL)
>
>   LOG_COMPILER = $(PYTHON) -B
> Index: bindings/vala/Makefile.am
> diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
> index
>
>
5a354238a47bd845468f0cd3ce94adbe8806c004..f3eb0d40da4878e44691bb0326b5f186e5405c8d
> 100644
> --- a/bindings/vala/Makefile.am
> +++ b/bindings/vala/Makefile.am
> @@ -2,8 +2,8 @@
>   #
>   # ibus - The Input Bus
>   #
> -# Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>
> -# Copyright (c) 2007-2015 Red Hat, Inc.
> +# Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>
> +# Copyright (c) 2007-2016 Red Hat, Inc.
>   #
>   # This library is free software; you can redistribute it and/or
>   # modify it under the terms of the GNU Lesser General Public
> @@ -43,6 +43,8 @@ vapidir = $(datadir)/vala/vapi
>   vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
>
>   MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS)
> +# for make distclean
> +CONFIG_CLEAN_FILES = $(VAPIGEN_VAPIS)
>
>   EXTRA_DIST = \
>         $(VAPIGEN_VAPIS) \
> Index: src/ibuskeymap.c
> diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
> index
>
>
79550332dfb51c0e3165d9bc2f8f8dda73ce4a8e..d7428c5da1a40fdf712d9d70c30d871eab0dd66d
> 100644
> --- a/src/ibuskeymap.c
> +++ b/src/ibuskeymap.c
> @@ -159,13 +159,17 @@ static gboolean
>   ibus_keymap_load (const gchar *name,
>                     KEYMAP       keymap)
>   {
> +    const gchar *envstr;
>       gchar *fname;
>       FILE *pf;
>       gchar buf[256];
>       gint lineno;
>
>
> -    fname = g_build_filename (IBUS_DATA_DIR, "keymaps", name, NULL);
> +    if ((envstr = g_getenv ("IBUS_KEYMAP_PATH")) != NULL)
> +        fname = g_build_filename (envstr, name, NULL);
> +    else
> +        fname = g_build_filename (IBUS_DATA_DIR, "keymaps", name, NULL);
>
>       if (fname == NULL) {
>           return FALSE;
> Index: src/tests/runtest
> diff --git a/src/tests/runtest b/src/tests/runtest
> index
>
>
81dc62d1a8c80b4cb65b62c54faf549823e46015..d66771b0e80b118facdaab261301763c45076509
> 100755
> --- a/src/tests/runtest
> +++ b/src/tests/runtest
> @@ -66,9 +66,13 @@ func_cleanup () {
>   func_copy_component () {
>     file=$1
>     base=`func_basename $file`
> +  libexecdir=`func_dirname $file`
> +  # top_srcdir != top_builddir in make dist
> +  libexecdir=`echo "$libexecdir" | sed -e "s|$top_srcdir|$top_builddir|"`
> +  echo $libexecdir
>     if test -f $file.in; then
>       mkdir -p components
> -    sed 's|@libexecdir@|'`func_dirname $file`'|g' < $file.in >
> components/$base
> +    sed "s|@libexecdir@|$libexecdir|g" < $file.in > components/$base
>     fi
>   }
>
>
>
>

[fujiwara, 2016-07-27 02:26:13]

Committed patchset #2 (id:20001) manually as
eee7a132d686cb8d9c36c632523649745487b503 (presubmit successful).