mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
761a585ce9
All the previous changes also repeated to support abbreviated alternative month names. In most languages which have declension and need nominative/genitive month names the abbreviated forms for both cases are the same. An example where they do differ is May in Russian: this name is too short to be abbreviated so even the abbreviated form features the declension suffixes. [BZ #10871] * locale/C-time.c (_nl_C_LC_TIME): Add abbreviated alternative month names, define them as the same as abbreviated month names explicitly. * locale/categories.def (LC_TIME): Add ab_alt_mon and wide-ab_alt_mon. * locale/langinfo.h: (_NL_ABALTMON_1, _NL_ABALTMON_2, _NL_ABALTMON_3, _NL_ABALTMON_4, _NL_ABALTMON_5, _NL_ABALTMON_6, _NL_ABALTMON_7, _NL_ABALTMON_8, _NL_ABALTMON_9, _NL_ABALTMON_10, _NL_ABALTMON_11, _NL_ABALTMON_12, _NL_WABALTMON_1, _NL_WABALTMON_2, _NL_WABALTMON_3, _NL_WABALTMON_4, _NL_WABALTMON_5, _NL_WABALTMON_6, _NL_WABALTMON_7, _NL_WABALTMON_8, _NL_WABALTMON_9, _NL_WABALTMON_10, _NL_WABALTMON_11, _NL_WABALTMON_12): New enum constants. * locale/programs/ld-time.c (struct locale_time_t): Add ab_alt_mon, wab_alt_mon, and ab_alt_mon_defined members. (time_output): Output ab_alt_mon and wab_alt_mon members. (time_read): Read them, initialize them as copies of abmon and wabmon respectively if they are missing, initialize ab_alt_mon_defined. * locale/programs/locfile-kw.gperf (ab_alt_mon): Define. * locale/programs/locfile-kw.h: Regenerate. * locale/programs/locfile-token.h (tok_ab_alt_mon): New enum constant. * time/Makefile [$(run-built-tests) = yes] (LOCALES): Add es_ES.UTF-8 and ru_RU.UTF-8. * time/strftime_l.c (a_altmonth, aam_len): New macros. [!COMPILE_WIDE] (ABALTMON_1): New macro. (__strftime_internal): Handle %Ob and %Oh formats. * time/strptime_l.c [_LIBC] (ab_alt_month_name): New macro. (__strptime_internal): Handle %Ob and %Oh formats. * time/tst-strptime.c (day_tests): Add more tests to parse different forms of month names including the new %Ob format specifier. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
77 lines
2.6 KiB
Makefile
77 lines
2.6 KiB
Makefile
# Copyright (C) 1991-2018 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 time routines
|
|
#
|
|
subdir := time
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := time.h sys/time.h sys/timeb.h bits/time.h \
|
|
bits/types/clockid_t.h bits/types/clock_t.h \
|
|
bits/types/struct_itimerspec.h \
|
|
bits/types/struct_timespec.h bits/types/struct_timeval.h \
|
|
bits/types/struct_tm.h bits/types/timer_t.h \
|
|
bits/types/time_t.h
|
|
|
|
routines := offtime asctime clock ctime ctime_r difftime \
|
|
gmtime localtime mktime time \
|
|
gettimeofday settimeofday adjtime tzset \
|
|
tzfile getitimer setitimer \
|
|
stime dysize timegm ftime \
|
|
getdate strptime strptime_l \
|
|
strftime wcsftime strftime_l wcsftime_l \
|
|
timespec_get
|
|
aux := era alt_digit lc-time-cleanup
|
|
|
|
tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
|
|
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
|
|
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
|
|
tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
|
|
tst-tzname
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
LOCALES := de_DE.ISO-8859-1 en_US.ISO-8859-1 ja_JP.EUC-JP fr_FR.UTF-8 \
|
|
es_ES.UTF-8 pl_PL.UTF-8 ru_RU.UTF-8
|
|
include ../gen-locales.mk
|
|
|
|
$(objpfx)tst-ftime_l.out: $(gen-locales)
|
|
$(objpfx)tst-strptime.out: $(gen-locales)
|
|
endif
|
|
|
|
tz-cflags = -DTZDIR='"$(zonedir)"' \
|
|
-DTZDEFAULT='"$(localtime-file)"' \
|
|
-DTZDEFRULES='"$(posixrules-file)"'
|
|
|
|
CFLAGS-tzfile.c += $(tz-cflags)
|
|
CFLAGS-tzset.c += $(tz-cflags)
|
|
CFLAGS-getdate.c += -fexceptions
|
|
|
|
# Don't warn about Y2k problem in strftime format string.
|
|
CFLAGS-test_time.c += -Wno-format
|
|
|
|
tst-getdate-ENV= DATEMSK=datemsk TZDIR=${common-objpfx}timezone/testdata
|
|
test_time-ARGS= EST5EDT CST
|
|
|
|
tst-tzname-ENV = TZDIR=${common-objpfx}timezone/testdata
|
|
CPPFLAGS-tst-tzname.c += -DTZDEFRULES='"$(posixrules-file)"'
|
|
|
|
bug-getdate1-ARGS = ${objpfx}bug-getdate1-fmt
|