From 337ff3c501f0e1fadd1036b6fa2754cfbb0c29ea Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 25 Oct 2017 09:06:45 -0700 Subject: [PATCH] localedata: Fix unicode-gen check target. After the transition to generating a distinct file for Unicode ctype information e.g. i18n_ctype, the check target was left with the wrong target name. This patch fixes the check target and regenerates the files with more information than previously used, filling in the the LC_IDENTIFICATION data. Tested on x86_64 by regenerating from Unicode source files, and running checks. Tested by subsequently rebuilding all locales. No regressions in testsuite. Signed-off-by: Carlos O'Donell Reported-by: Rafal Luzynski --- ChangeLog | 14 ++++++++++++++ localedata/locales/i18n_ctype | 27 ++++++++++++++------------- localedata/locales/tr_TR | 2 +- localedata/locales/translit_circle | 2 +- localedata/locales/translit_cjk_compat | 2 +- localedata/locales/translit_combining | 2 +- localedata/locales/translit_compat | 2 +- localedata/locales/translit_font | 2 +- localedata/locales/translit_fraction | 2 +- localedata/unicode-gen/Makefile | 4 ++-- 10 files changed, 37 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76c592e5d3..070d07f5b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2017-10-25 Carlos O'Donell + + * localedata/unicode-gen/Makefile (check_i18n): Rename to + check_i18n_ctype. Depend on i18n_ctype-report. Check i18n_ctype-report + file. + * localedata/locales/i18n_ctype: Regenerate. + * localedata/locales/tr_TR: Likewise. + * localedata/locales/translit_circle: Likewise. + * localedata/locales/translit_cjk_compat: Likewise. + * localedata/locales/translit_combining: Likewise. + * localedata/locales/translit_compat: Likewise. + * localedata/locales/translit_font: Likewise. + * localedata/locales/translit_fraction: Likewise. + 2017-10-25 Rajalakshmi Srinivasaraghavan * sysdeps/powerpc/powerpc64/power7/memcpy.S: Replace diff --git a/localedata/locales/i18n_ctype b/localedata/locales/i18n_ctype index da88efc75e..b965563d49 100644 --- a/localedata/locales/i18n_ctype +++ b/localedata/locales/i18n_ctype @@ -8,25 +8,26 @@ comment_char % % exempt you from the conditions of the license if your use would % otherwise be governed by that license. -% % The only purpose for this file is to provide the basic Unicode % LC_CTYPE information. This way other locales that need this % information, but with different transliterations, can include it % directly. -% + +% Generated automatically by gen_unicode_ctype.py for Unicode 10.0.0. LC_IDENTIFICATION -title "" -source "" -address "" -contact "" -email "" -tel "" -fax "" -language "" -territory "" -revision "" -date "2017-10-11" +title "Unicode 10.0.0 FDCC-set" +source "UnicodeData.txt, DerivedCoreProperties.txt" +address "" +contact "" +email "bug-glibc-locales@gnu.org" +tel "" +fax "" +language "" +territory "Earth" +revision "10.0.0" +date "2017-10-23" +category "unicode:2014";LC_CTYPE category "i18n:2012";LC_IDENTIFICATION category "i18n:2012";LC_CTYPE diff --git a/localedata/locales/tr_TR b/localedata/locales/tr_TR index 5925a93880..4bcc8ed3b9 100644 --- a/localedata/locales/tr_TR +++ b/localedata/locales/tr_TR @@ -43,7 +43,7 @@ fax "" language "Turkish" territory "Turkey" revision "1.0" -date "2017-06-20" +date "2017-10-23" category "i18n:2012";LC_IDENTIFICATION category "i18n:2012";LC_CTYPE diff --git a/localedata/locales/translit_circle b/localedata/locales/translit_circle index bcf1e8eeef..6b52111d82 100644 --- a/localedata/locales/translit_circle +++ b/localedata/locales/translit_circle @@ -9,7 +9,7 @@ comment_char % % otherwise be governed by that license. % Transliterations of encircled characters. -% Generated automatically from UnicodeData.txt by gen_translit_circle.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_circle.py on 2017-10-23 for Unicode 10.0.0. LC_CTYPE diff --git a/localedata/locales/translit_cjk_compat b/localedata/locales/translit_cjk_compat index cf8307decb..490c8f6671 100644 --- a/localedata/locales/translit_cjk_compat +++ b/localedata/locales/translit_cjk_compat @@ -9,7 +9,7 @@ comment_char % % otherwise be governed by that license. % Transliterations of CJK compatibility characters. -% Generated automatically from UnicodeData.txt by gen_translit_cjk_compat.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_cjk_compat.py on 2017-10-23 for Unicode 10.0.0. LC_CTYPE diff --git a/localedata/locales/translit_combining b/localedata/locales/translit_combining index bf801abcdd..4451c7e8f6 100644 --- a/localedata/locales/translit_combining +++ b/localedata/locales/translit_combining @@ -10,7 +10,7 @@ comment_char % % Transliterations that remove all combining characters (accents, % pronounciation marks, etc.). -% Generated automatically from UnicodeData.txt by gen_translit_combining.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_combining.py on 2017-10-23 for Unicode 10.0.0. LC_CTYPE diff --git a/localedata/locales/translit_compat b/localedata/locales/translit_compat index a5668168a5..c85b1cfe04 100644 --- a/localedata/locales/translit_compat +++ b/localedata/locales/translit_compat @@ -9,7 +9,7 @@ comment_char % % otherwise be governed by that license. % Transliterations of compatibility characters and ligatures. -% Generated automatically from UnicodeData.txt by gen_translit_compat.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_compat.py on 2017-10-23 for Unicode 10.0.0. LC_CTYPE diff --git a/localedata/locales/translit_font b/localedata/locales/translit_font index faffd6aaa1..dc61ffd2d0 100644 --- a/localedata/locales/translit_font +++ b/localedata/locales/translit_font @@ -9,7 +9,7 @@ comment_char % % otherwise be governed by that license. % Transliterations of font equivalents. -% Generated automatically from UnicodeData.txt by gen_translit_font.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_font.py on 2017-10-23 for Unicode 10.0.0. LC_CTYPE diff --git a/localedata/locales/translit_fraction b/localedata/locales/translit_fraction index ff6d0e22a7..2bf92b9177 100644 --- a/localedata/locales/translit_fraction +++ b/localedata/locales/translit_fraction @@ -9,7 +9,7 @@ comment_char % % otherwise be governed by that license. % Transliterations of fractions. -% Generated automatically from UnicodeData.txt by gen_translit_fraction.py on 2017-06-01 for Unicode 10.0.0. +% Generated automatically from UnicodeData.txt by gen_translit_fraction.py on 2017-10-23 for Unicode 10.0.0. % The replacements have been surrounded with spaces, because fractions are % often preceded by a decimal number and followed by a unit or a math symbol. diff --git a/localedata/unicode-gen/Makefile b/localedata/unicode-gen/Makefile index 32f4a53504..91c4f891bd 100644 --- a/localedata/unicode-gen/Makefile +++ b/localedata/unicode-gen/Makefile @@ -78,9 +78,9 @@ i18n_ctype-report: ctype_compatibility.py ctype_compatibility_test_cases.py $(PYTHON3) ./ctype_compatibility.py -o ../locales/i18n_ctype \ -n i18n_ctype -a -m > $@ -check-i18n: i18n-report +check-i18n_ctype: i18n_ctype-report @if grep '\(Missing\|Added\) [^0]\|^Number of errors[^=]* = [^0]' \ - i18n-report; \ + i18n_ctype-report; \ then echo manual verification required; false; else true; fi tr_TR: UnicodeData.txt DerivedCoreProperties.txt -- 2.11.4.GIT