mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
02eec68167
From localedef --help:
Output control:
...
--no-warnings=<warnings> Comma-separated list of warnings to disable;
supported warnings are: ascii, intcurrsym
...
--warnings=<warnings> Comma-separated list of warnings to enable;
supported warnings are: ascii, intcurrsym
Locales using SHIFT_JIS and SHIFT_JISX0213 character maps are not ASCII
compatible. In order to build locales using these character maps, and
have localedef exit with a status of 0, we add new option to localedef
to disable or enable specific warnings. The options are --no-warnings
and --warnings, to disable and enable specific warnings respectively.
The options take a comma-separated list of warning names. The warning
names are taken directly from the generated warning. When a warning
that can be disabled is issued it will print something like this: foo is
not defined [--no-warnings=foo]
For the initial implementation we add two controllable warnings; first
'ascii' which is used by the localedata installation makefile target to
install SHIFT_JIS and SHIFT_JISX0213-using locales without error; second
'intcurrsym' which allows a program to use a non-standard international
currency symbol without triggering a warning. The 'intcurrsym' is
useful in the future if country codes are added that are not in our
current ISO 4217 list, and the user wants to avoid the warning. Having
at least two warnings to control gives an example for how the changes
can be extended to more warnings if required in the future.
These changes allow ja_JP.SHIFT_JIS and ja_JP.SHIFT_JISX0213 to be
compiled without warnings using --no-warnings=ascii. The
localedata/Makefile $(INSTALL-SUPPORTED-LOCALES) target is adjusted to
automatically add `--no-warnings=ascii` for such charmaps, and likewise
localedata/gen-locale.sh is adjusted with similar logic.
v2: Bring verbose, be_quiet, and all warning control booleans into
record-status.c, and compile this object file to be used by locale,
iconv, and localedef. Any users include record-status.h.
v3: Fix an instance of boolean coercion in set_warning().
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
238 lines
9.3 KiB
Makefile
238 lines
9.3 KiB
Makefile
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
# Makefile for installing locale data source files.
|
|
|
|
subdir := localedata
|
|
|
|
include ../Makeconfig
|
|
|
|
# List with all available character set descriptions.
|
|
charmaps := $(wildcard charmaps/[A-I]*) $(wildcard charmaps/[J-Z]*)
|
|
|
|
# List with all available character set descriptions.
|
|
locales := $(wildcard locales/*)
|
|
|
|
|
|
subdir-dirs = tests-mbwc
|
|
vpath %.c tests-mbwc
|
|
vpath %.h tests-mbwc
|
|
|
|
|
|
test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
|
|
tst-ctype tst-langinfo tst-langinfo-static tst-numeric
|
|
test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
|
|
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
|
|
si_LK.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8
|
|
test-input-data = $(addsuffix .in, $(test-input))
|
|
test-output := $(foreach s, .out .xout, \
|
|
$(addsuffix $s, $(basename $(test-input))))
|
|
ld-test-names := test1 test2 test3 test4 test5 test6 test7
|
|
ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
|
|
$(addsuffix .def,$(ld-test-names)) \
|
|
$(addsuffix .ds,test5 test6) \
|
|
test6.c trans.def)
|
|
|
|
fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \
|
|
y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
|
|
|
|
generated += $(test-input) $(test-output) sort-test.out tst-locale.out \
|
|
tst-leaks.mtrace mtrace-tst-leaks.out
|
|
generated-dirs += $(ld-test-names) tt_TT de_DE.437 \
|
|
$(addprefix tstfmon_,$(fmon-tests)) \
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
|
|
tst_iswctype tst_iswdigit tst_iswgraph \
|
|
tst_iswlower tst_iswprint tst_iswpunct \
|
|
tst_iswspace tst_iswupper tst_iswxdigit tst_mblen \
|
|
tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
|
|
tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \
|
|
tst_swscanf tst_towctrans tst_towlower \
|
|
tst_towupper tst_wcrtomb tst_wcscat tst_wcschr \
|
|
tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn \
|
|
tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy \
|
|
tst_wcspbrk tst_wcsrtombs tst_wcsspn tst_wcsstr \
|
|
tst_wcstod tst_wcstok tst_wcstombs tst_wcswidth \
|
|
tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans \
|
|
tst_wctype tst_wcwidth
|
|
|
|
tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
|
|
tst-leaks tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
|
|
tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
|
|
tst-strfmon1 tst-sscanf bug-setlocale1 tst-setlocale2 tst-setlocale3 \
|
|
tst-wctype
|
|
tests-static = bug-setlocale1-static
|
|
tests += $(tests-static)
|
|
ifeq (yes,$(build-shared))
|
|
ifneq (no,$(PERL))
|
|
tests-special += $(objpfx)mtrace-tst-leaks.out
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
# Files to install.
|
|
install-others := $(addprefix $(inst_i18ndir)/, \
|
|
$(addsuffix .gz, $(charmaps)) \
|
|
$(locales))
|
|
|
|
tests: $(objdir)/iconvdata/gconv-modules
|
|
|
|
tests-static += tst-langinfo-static
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
|
|
$(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
|
|
$(objpfx)tst-trans.out $(objpfx)tst-ctype.out \
|
|
$(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \
|
|
$(objpfx)tst-numeric.out
|
|
# We have to generate locales
|
|
LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
|
|
en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
|
|
hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
|
|
nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
|
|
zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
|
|
tr_TR.ISO-8859-9 en_GB.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8
|
|
include ../gen-locales.mk
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
# Install the charmap files in gzipped format.
|
|
$(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force)
|
|
$(make-target-directory)
|
|
rm -f $(@:.gz=) $@
|
|
$(INSTALL_DATA) $< $(@:.gz=)
|
|
gzip -9n $(@:.gz=)
|
|
|
|
# Install the locale source files in the appropriate directory.
|
|
$(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install)
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
generated-dirs += $(LOCALES)
|
|
|
|
$(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
|
|
$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
|
|
$(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix-before-env)' \
|
|
'$(run-program-env)' '$(test-program-prefix-after-env)' \
|
|
$(test-input) \
|
|
> $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
|
|
$(objpfx)sort-test.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(run-program-prefix-before-env)' \
|
|
'$(run-program-env)' '$(run-program-prefix-after-env)' \
|
|
'$(test-program-prefix)' tst-fmon.data \
|
|
> $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
|
|
$(objpfx)sort-test.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' tst-numeric.data \
|
|
> $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
|
|
$(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(built-program-cmd-before-env)' \
|
|
'$(run-program-env)' '$(built-program-cmd-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
|
|
$(objpfx)tst-fmon.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(run-program-prefix-before-env)' \
|
|
'$(run-program-env)' '$(run-program-prefix-after-env)' \
|
|
'$(test-program-prefix-before-env)' \
|
|
'$(test-program-prefix-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
|
|
$(objpfx)sort-test.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
|
|
'$(run-program-env)' '$(test-program-cmd-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
|
|
$(objpfx)sort-test.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
|
|
'$(run-program-env)' '$(test-program-cmd-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-langinfo-static.out: tst-langinfo.sh $(objpfx)tst-langinfo-static \
|
|
$(objpfx)sort-test.out \
|
|
$(addprefix $(objpfx),$(CTYPE_FILES))
|
|
$(SHELL) $< $(common-objpfx) '$(test-program-cmd-before-env)' \
|
|
'$(run-program-env)' '$(test-program-cmd-after-env)' > $@; \
|
|
$(evaluate-test)
|
|
$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
|
|
$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
|
|
endif
|
|
|
|
include SUPPORTED
|
|
|
|
INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
|
|
|
|
# Sometimes the whole collection of locale files should be installed.
|
|
LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
|
|
$(rtld-prefix) $(common-objpfx)locale/localedef
|
|
install-locales: $(INSTALL-SUPPORTED-LOCALES)
|
|
|
|
install-locales-dir:
|
|
$(..)./scripts/mkinstalldirs $(inst_complocaledir)
|
|
|
|
# The SHIFT_JIS and SHIFT_JISX0213 character maps are not ASCII compatible,
|
|
# therefore we have to use --no-warnings=ascii to disable the ASCII check.
|
|
# See localedata/gen-locale.sh for the same logic.
|
|
$(INSTALL-SUPPORTED-LOCALES): install-locales-dir
|
|
@locale=`echo $@ | sed -e 's/^install-//'`; \
|
|
charset=`echo $$locale | sed -e 's,.*/,,'`; \
|
|
locale=`echo $$locale | sed -e 's,/[^/]*,,'`; \
|
|
flags="--quiet -c"; \
|
|
if [ "$$charset" = 'SHIFT_JIS' ] \
|
|
|| [ "$$charset" = 'SHIFT_JISX0213' ]; then \
|
|
flags="$$flags --no-warnings=ascii"; \
|
|
fi; \
|
|
echo -n `echo $$locale | sed 's/\([^.\@]*\).*/\1/'`; \
|
|
echo -n ".$$charset"; \
|
|
echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
|
|
echo -n '...'; \
|
|
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
|
|
$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
|
|
-i locales/$$input -f charmaps/$$charset \
|
|
$(addprefix --prefix=,$(install_root)) $$locale \
|
|
&& echo ' done'; \
|
|
|
|
tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
|
|
tst-wctype-ENV = LC_ALL=ja_JP.EUC-JP
|
|
|
|
tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace
|
|
$(objpfx)mtrace-tst-leaks.out: $(objpfx)tst-leaks.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@; \
|
|
$(evaluate-test)
|
|
|
|
bug-setlocale1-ENV-only = LOCPATH=$(objpfx) LC_CTYPE=de_DE.UTF-8
|
|
bug-setlocale1-static-ENV-only = $(bug-setlocale1-ENV-only)
|
|
|
|
$(objdir)/iconvdata/gconv-modules:
|
|
$(MAKE) -C ../iconvdata subdir=iconvdata $@
|