maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC.

* bootstrap.conf (gnulib_modules): Require progname.
	* src/complain.c, src/getargs.c, src/getargs.h, src/main.c: Use it.
	* cfg.mk (exclude): New.
	Use it.
	Skip lib/main.c for bindtextdomain and set_program_name.
This commit is contained in:
Akim Demaille
2012-02-19 11:13:04 +01:00
parent 222342aa67
commit 4d699f44e6
7 changed files with 18 additions and 13 deletions

View File

@@ -22,7 +22,8 @@ gnulib_modules='
gettext git-version-gen gitlog-to-changelog
gpl-3.0 hash inttypes isnan javacomp-script
javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
mbswidth obstack perror pipe-posix quote quotearg realloc-posix
mbswidth obstack perror pipe-posix progname
quote quotearg realloc-posix
spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
sysexits
unistd unistd-safer unlocked-io update-copyright unsetenv verify

17
cfg.mk
View File

@@ -35,9 +35,6 @@ url_dir_list = \
# Tests not to run as part of "make distcheck".
local-checks-to-skip = \
sc_immutable_NEWS \
sc_bindtextdomain \
sc_program_name \
sc_prohibit_HAVE_MBRTOWC \
sc_prohibit_always-defined_macros \
sc_prohibit_always_true_header_tests \
sc_prohibit_atoi_atof \
@@ -58,8 +55,12 @@ update-copyright: update-b4-copyright update-package-copyright-year
update-copyright-env = \
UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^src/parse-gram.h$$
exclude_file_name_regexp--sc_require_config_h_first = \
^(lib/yyerror|data/(glr|yacc))\.c$$
exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$
exclude_file_name_regexp--sc_unmarked_diagnostics = ^djgpp/
exclude = $(foreach a,$(1),$(eval exclude_file_name_regexp--sc_$(a)))
$(call exclude, \
bindtextdomain=^lib/main.c$$ \
program_name=^lib/main.c$$ \
prohibit_empty_lines_at_EOF=^src/parse-gram.h$$ \
require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \
space_tab=^tests/(input|c\+\+)\.at$$ \
unmarked_diagnostics=^djgpp/ \
)

2
lib/.gitignore vendored
View File

@@ -264,3 +264,5 @@
/fpending.c
/fpending.h
/sysexits.in.h
/progname.c
/progname.h

View File

@@ -23,6 +23,7 @@
#include "system.h"
#include <stdarg.h>
#include <progname.h>
#include "complain.h"
#include "files.h"

View File

@@ -40,6 +40,8 @@
# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
#endif
#include <progname.h>
#include "complain.h"
#include "files.h"
#include "getargs.h"
@@ -75,8 +77,6 @@ int language_prio = default_prio;
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
char *program_name;
/** Decode an option's set of keys.
*

View File

@@ -23,7 +23,6 @@
#include "location.h"
extern char *program_name;
enum { command_line_prio, grammar_prio, default_prio };
/* flags set by % directives */

View File

@@ -24,6 +24,7 @@
#include <bitset_stats.h>
#include <bitset.h>
#include <configmake.h>
#include <progname.h>
#include <quotearg.h>
#include <timevar.h>
@@ -57,7 +58,7 @@
int
main (int argc, char *argv[])
{
program_name = argv[0];
set_program_name (argv[0]);
setlocale (LC_ALL, "");
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) bindtextdomain ("bison-runtime", LOCALEDIR);