ibus-typing-booster November 2016

ibus-typing-booster@lists.fedorahosted.org

1 participants
21 discussions

[ibus-typing-booster] master: Release 1.5.11 (6783a62)
by mfabian＠fedoraproject.org 17 Nov '16

17 Nov '16

1 0

[ibus-typing-booster] master: Right align the widgets for candidate window size and minimum number of chars for completion (d6108a1)
by mfabian＠fedoraproject.org 17 Nov '16

17 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit d6108a123fd82893398299f36e67a93c131d182b Author: Mike FABIAN <mfabian(a)redhat.com> Date: Wed Nov 16 11:29:41 2016 +0100 Right align the widgets for candidate window size and minimum number of chars for completion >--------------------------------------------------------------- setup/setup.glade | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/setup/setup.glade b/setup/setup.glade index 305a611..2a85e18 100644 --- a/setup/setup.glade +++ b/setup/setup.glade @@ -125,6 +125,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -213,6 +214,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child>

1 0

[ibus-typing-booster] master: Fix some pylint warnings (9e93333)
by mfabian＠fedoraproject.org 17 Nov '16

17 Nov '16

1 0

[ibus-typing-booster] master: Merge editor and tabengine classes (9f05187)
by mfabian＠fedoraproject.org 17 Nov '16

17 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 9f05187e9a29b333b5b698204dc4c1f99a3d561e Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sat Nov 12 10:40:34 2016 +0100 Merge editor and tabengine classes It makes no sense to have an extra class ��editor�� when tabengine needs to access most internals of the editor class all the time. >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^9f05187e9a29b333b5b698204dc4c1f99a3d561e~1 9f05187e9a29b333b5b698204dc4c1f99a3d561e

1 0

[ibus-typing-booster] master: Release 1.5.10 (289516c)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

1 0

[ibus-typing-booster] master: Add test cases for accent insensitive matching (2c82ee6)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 2c82ee67e461ab18f6e64bc7d58e1e50b4ea36bd Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Nov 8 11:55:41 2016 +0100 Add test cases for accent insensitive matching >--------------------------------------------------------------- tests/test_itb.py | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/tests/test_itb.py b/tests/test_itb.py index 77de9ac..cc8fd84 100644 --- a/tests/test_itb.py +++ b/tests/test_itb.py @@ -374,3 +374,111 @@ class ItbTestCase(unittest.TestCase): for x in self.engine._editor._candidates] self.assertEqual(True, '��' in candidates) self.assertEqual('��', candidates[0]) + + def test_accent_insensitive_matching_german_dictionary(self): + self.engine.set_current_imes(['NoIme', 't-latn-post']) + self.engine.set_dictionary_names(['de_DE']) + self.engine.do_process_key_event(IBus.KEY_A, 0, 0) + self.engine.do_process_key_event(IBus.KEY_l, 0, 0) + self.engine.do_process_key_event(IBus.KEY_p, 0, 0) + self.engine.do_process_key_event(IBus.KEY_e, 0, 0) + self.engine.do_process_key_event(IBus.KEY_n, 0, 0) + self.engine.do_process_key_event(IBus.KEY_g, 0, 0) + self.engine.do_process_key_event(IBus.KEY_l, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_e, 0, 0) + self.engine.do_process_key_event(IBus.KEY_n, 0, 0) + self.assertEqual( + unicodedata.normalize('NFC', + self.engine._editor._candidates[0][0]), + 'Alpengl��hen') + self.engine.do_process_key_event(IBus.KEY_F1, 0, 0) + self.assertEqual(self.engine._mock_committed_text, 'Alpengl��hen ') + + def test_accent_insensitive_matching_german_database(self): + self.engine.set_current_imes(['t-latn-post', 'NoIme']) + self.engine.set_dictionary_names(['de_DE']) + # Type ��Gl��hw��rmchen�� + self.engine.do_process_key_event(IBus.KEY_G, 0, 0) + self.engine.do_process_key_event(IBus.KEY_l, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_quotedbl, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_w, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_quotedbl, 0, 0) + self.engine.do_process_key_event(IBus.KEY_r, 0, 0) + self.engine.do_process_key_event(IBus.KEY_m, 0, 0) + self.engine.do_process_key_event(IBus.KEY_c, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_e, 0, 0) + self.engine.do_process_key_event(IBus.KEY_n, 0, 0) + # The German hunspell recognizes this as a correct word + # (although it is not in the dictionary as a single word + # it is created by rules). Therefore, it must be + # the first candidate here: + self.assertEqual( + unicodedata.normalize('NFC', + self.engine._editor._candidates[0][0]), + 'Gl��hw��rmchen') + # user_freq must be 0 because this word has not been found in + # the user database, it is only a candidate because it is a + # valid word according to hunspell: + self.assertEqual(self.engine._editor._candidates[0][1], 0) + # Commit with F1: + self.engine.do_process_key_event(IBus.KEY_F1, 0, 0) + # Type ��Gl��hw��rmchen�� again: + self.engine.do_process_key_event(IBus.KEY_G, 0, 0) + self.engine.do_process_key_event(IBus.KEY_l, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_quotedbl, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_w, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_quotedbl, 0, 0) + self.engine.do_process_key_event(IBus.KEY_r, 0, 0) + self.engine.do_process_key_event(IBus.KEY_m, 0, 0) + self.engine.do_process_key_event(IBus.KEY_c, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_e, 0, 0) + self.engine.do_process_key_event(IBus.KEY_n, 0, 0) + # Again it should be the first candidate: + self.assertEqual( + unicodedata.normalize('NFC', + self.engine._editor._candidates[0][0]), + 'Gl��hw��rmchen') + # But now user_freq must be > 0 because the last commit + # added this word to the user database: + self.assertTrue(self.engine._editor._candidates[0][1] > 0) + # Commit with F1: + self.engine.do_process_key_event(IBus.KEY_F1, 0, 0) + self.assertEqual( + self.engine._mock_committed_text, + 'Gl��hw��rmchen Gl��hw��rmchen ') + # Type ��Gluhwurmchen�� (without the accents): + self.engine.do_process_key_event(IBus.KEY_G, 0, 0) + self.engine.do_process_key_event(IBus.KEY_l, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_w, 0, 0) + self.engine.do_process_key_event(IBus.KEY_u, 0, 0) + self.engine.do_process_key_event(IBus.KEY_r, 0, 0) + self.engine.do_process_key_event(IBus.KEY_m, 0, 0) + self.engine.do_process_key_event(IBus.KEY_c, 0, 0) + self.engine.do_process_key_event(IBus.KEY_h, 0, 0) + self.engine.do_process_key_event(IBus.KEY_e, 0, 0) + self.engine.do_process_key_event(IBus.KEY_n, 0, 0) + # The first candidate should be ��Gl��hw��rmchen�� again now + # because the input phrases are added without accents into the + # user database and before matching against the user database + # accents are removed from the input phrase: + self.assertEqual( + unicodedata.normalize('NFC', + self.engine._editor._candidates[0][0]), + 'Gl��hw��rmchen') + # Commit with F1: + self.engine.do_process_key_event(IBus.KEY_F1, 0, 0) + self.assertEqual( + self.engine._mock_committed_text, + 'Gl��hw��rmchen Gl��hw��rmchen Gl��hw��rmchen ')

1 0

[ibus-typing-booster] master: Make accent insensitive matching also work in the user database (95eb844)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

1 0

[ibus-typing-booster] master: Add 'No' (Number, Other) to VALID_CATEGORIES to be able to match �� U+00B9 SUPERSCRIPT ONE (37b0554)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 37b0554236a45b596219bdda98de9722d255d00a Author: Mike FABIAN <mfabian(a)redhat.com> Date: Tue Nov 8 11:53:37 2016 +0100 Add 'No' (Number, Other) to VALID_CATEGORIES to be able to match �� U+00B9 SUPERSCRIPT ONE >--------------------------------------------------------------- engine/itb_emoji.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/engine/itb_emoji.py b/engine/itb_emoji.py index 1667d08..a8e95ec 100644 --- a/engine/itb_emoji.py +++ b/engine/itb_emoji.py @@ -44,6 +44,7 @@ DATADIR = os.path.join(os.path.dirname(__file__), '../data') VALID_CATEGORIES = ( 'Cf', # Other, Format (RIGHT-TO-LEFT MARK ...) + 'No', # Number, Other (SUPERSCRIPT ONE etc.). 'Pc', # Punctuation, Connector 'Pd', # Punctuation, dash 'Pe', # Punctuation, Close @@ -866,6 +867,9 @@ class EmojiMatcher(): >>> mq.candidates('euro sign')[0][:2] ('��', 'euro sign') + >>> mq.candidates('superscript one')[0][:2] + ('��', 'superscript one') + >>> mq = EmojiMatcher(languages = ['fr_FR']) >>> mq.candidates('chat')[0][:2] ('��', 'chat')

1 0

[ibus-typing-booster] master: use AC_PROG_MKDIR_P instead of AM_PROG_MKDIR_P (0ed588c)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit 0ed588c306610d9e3e3466465b4f8e7d316d9306 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sat Nov 5 13:44:45 2016 +0100 use AC_PROG_MKDIR_P instead of AM_PROG_MKDIR_P >--------------------------------------------------------------- m4/po.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/m4/po.m4 b/m4/po.m4 index 00133ef..a7d8fb4 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl defined by automake AC_REQUIRE([AM_NLS])dnl dnl Perform the following tests also if --disable-nls has been given,

1 0

[ibus-typing-booster] master: Update ��missing�� script (e51c5fd)
by mfabian＠fedoraproject.org 09 Nov '16

09 Nov '16

Repository : http://git.fedorahosted.org/git/?p=ibus-typing-booster.git On branch : master >--------------------------------------------------------------- commit e51c5fd749358fcc4a8dd739219c6b18618daaf7 Author: Mike FABIAN <mfabian(a)redhat.com> Date: Sat Nov 5 13:44:09 2016 +0100 Update ��missing�� script >--------------------------------------------------------------- missing | 414 +++++++++++++++++++++++---------------------------------------- 1 files changed, 149 insertions(+), 265 deletions(-) diff --git a/missing b/missing index 86a8fc3..f62bbae 100755 --- a/missing +++ b/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' -sed_minuso='s/.* -o $[^ ]*$.*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <bug-automake(a)gnu.org>." exit $? @@ -99,228 +70,141 @@ Send bug reports to <bug-automake(a)gnu.org>." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* $[^ ]*$ *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

ibus-typing-booster November 2016