diff options
author | Jim Meyering <meyering@redhat.com> | 2011-03-14 14:26:38 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-03-16 12:22:22 +0100 |
commit | 8e4e1d484f88502dbe9336050232a5f90e0b68d4 (patch) | |
tree | aa9036ddd6b86e42888e5e10ea5762fb2ae58cc8 /cfg.mk | |
parent | 0ddfd54b08dfe4e78b8aa2dd74378e5b62c9d68c (diff) | |
download | coreutils-8e4e1d484f88502dbe9336050232a5f90e0b68d4.tar.xz |
maint: stop using .x-sc_* files to list syntax-check exemptions
Instead, use the brand new mechanism with which you merely use a
variable (derived from the rule name) defined in cfg.mk to an ERE
matching the exempted file names.
* gnulib: Update to latest, to get maint.mk that implements this.
* Makefile.am (syntax_check_exceptions): Remove variable.
(EXTRA_DIST): Remove use of the variable.
* cfg.mk (sc_x_sc_dist_check): Remove rule, no longer useful.
(exclude_file_name_regexp--sc_space_tab): Define variable.
(exclude_file_name_regexp--sc_bindtextdomain): Likewise.
(exclude_file_name_regexp--sc_unmarked_diagnostics): Likewise.
(exclude_file_name_regexp--sc_error_message_uppercase): Likewise.
(exclude_file_name_regexp--sc_trailing_blank): Likewise.
(exclude_file_name_regexp--sc_system_h_headers): Likewise.
(exclude_file_name_regexp--sc_require_config_h_first): Likewise.
(exclude_file_name_regexp--sc_require_config_h): Likewise.
(exclude_file_name_regexp--sc_po_check): Likewise.
(exclude_file_name_regexp--sc_prohibit_always-defined_macros): Likewise.
(exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF): Likewise.
(exclude_file_name_regexp--sc_program_name): Likewise.
(exclude_file_name_regexp--sc_file_system): Likewise.
(exclude_file_name_regexp--sc_prohibit_always_true_header_tests):
Likewise.
(exclude_file_name_regexp--sc_prohibit_fail_0): Likewise.
(exclude_file_name_regexp--sc_prohibit_atoi_atof): Likewise.
(exclude_file_name_regexp--sc_prohibit_tab_based_indentation): Likewise.
(exclude_file_name_regexp--sc_prohibit_stat_st_blocks): Likewise.
* configure.ac [whether localtime caches TZ]: Use return 0/1, not
exit (0/1) to avoid triggering a sc_prohibit_magic_number_exit failure.
* .x-sc_GPL_version: Remove file.
* .x-sc_bindtextdomain: Likewise.
* .x-sc_error_message_uppercase: Likewise.
* .x-sc_file_system: Likewise.
* .x-sc_obsolete_symbols: Likewise.
* .x-sc_po_check: Likewise.
* .x-sc_program_name: Likewise.
* .x-sc_prohibit_always-defined_macros: Likewise.
* .x-sc_prohibit_always_true_header_tests: Likewise.
* .x-sc_prohibit_atoi_atof: Likewise.
* .x-sc_prohibit_empty_lines_at_EOF: Likewise.
* .x-sc_prohibit_fail_0: Likewise.
* .x-sc_prohibit_magic_number_exit: Likewise.
* .x-sc_prohibit_stat_st_blocks: Likewise.
* .x-sc_prohibit_strcmp: Likewise.
* .x-sc_prohibit_tab_based_indentation: Likewise.
* .x-sc_require_config_h: Likewise.
* .x-sc_require_config_h_first: Likewise.
* .x-sc_space_tab (config): Likewise.
* .x-sc_sun_os_names: Likewise.
* .x-sc_system_h_headers: Likewise.
* .x-sc_trailing_blank: Likewise.
* .x-sc_unmarked_diagnostics: Likewise.
* .x-sc_useless_cpp_parens: Likewise.
Diffstat (limited to 'cfg.mk')
-rw-r--r-- | cfg.mk | 45 |
1 files changed, 32 insertions, 13 deletions
@@ -93,19 +93,6 @@ sc_root_tests: exit 1; } || :; \ fi -# Ensure that the syntax_check_exceptions file list in Makefile.am -# stays in sync with corresponding files in the repository. -sce = syntax_check_exceptions -sc_x_sc_dist_check: - @test "$$( ($(VC_LIST) | sed -n '/\.x-sc_/p' \ - | sed 's|^$(_dot_escaped_srcdir)/||'; \ - sed -n '/^$(sce) =[ ]*\\$$/,/[^\]$$/p' \ - $(srcdir)/Makefile.am \ - | sed 's/^ *//;/^$(sce) =/d' \ - | tr -s '\012\\' ' ' | fmt -1 \ - ) | sort | uniq -u)" \ - && { echo 'Makefile.am: $(sce) mismatch' >&2; exit 1; } || :; - # Create a list of regular expressions matching the names # of files included from system.h. Exclude a couple. .re-list: @@ -337,3 +324,35 @@ include $(srcdir)/dist-check.mk update-copyright-env = \ UPDATE_COPYRIGHT_USE_INTERVALS=1 \ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 + +# List syntax-check exemptions. +exclude_file_name_regexp--sc_space_tab = \ + ^(tests/pr/|tests/misc/nl$$|gl/.*\.diff$$) +exclude_file_name_regexp--sc_bindtextdomain = ^(gl/.*|lib/euidaccess-stat)\.c$$ +exclude_file_name_regexp--sc_unmarked_diagnostics = ^build-aux/cvsu$$ +exclude_file_name_regexp--sc_error_message_uppercase = ^build-aux/cvsu$$ +exclude_file_name_regexp--sc_trailing_blank = ^tests/pr/ +exclude_file_name_regexp--sc_system_h_headers = \ + ^src/((system|copy)\.h|libstdbuf\.c)$$ + +_src = (false|lbracket|ls-(dir|ls|vdir)|tac-pipe|uname-(arch|uname)) +exclude_file_name_regexp--sc_require_config_h_first = \ + (^lib/buffer-lcm\.c|src/$(_src)\.c)$$ +exclude_file_name_regexp--sc_require_config_h = \ + $(exclude_file_name_regexp--sc_require_config_h_first) + +exclude_file_name_regexp--sc_po_check = ^gl/ +exclude_file_name_regexp--sc_prohibit_always-defined_macros = ^src/seq\.c$$ +exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/ +exclude_file_name_regexp--sc_program_name = ^(gl/.*|lib/euidaccess-stat)\.c$$ +exclude_file_name_regexp--sc_file_system = NEWS|^(src/df\.c|tests/misc/df-P)$$ +exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ + ^m4/stat-prog\.m4$$ +exclude_file_name_regexp--sc_prohibit_fail_0 = \ + (^tests/init\.sh|Makefile\.am|\.mk)$$ +exclude_file_name_regexp--sc_prohibit_atoi_atof = ^lib/euidaccess-stat\.c$$ +exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \ + ^tests/pr/|(^gl/lib/reg.*\.c\.diff|Makefile(\.am)?|\.mk|^man/help2man)$$ + +exclude_file_name_regexp--sc_prohibit_stat_st_blocks = \ + ^(src/system\.h|tests/du/2g)$$ |