From: Mike Frysinger Date: Sat, 23 Apr 2016 19:42:54 +0000 (-0400) Subject: unicode-gen: include standard comment file header X-Git-Tag: glibc-2.24~119 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277da2ab88b5c0d20ebdb0a3e7e0948398105a14;p=thirdparty%2Fglibc.git unicode-gen: include standard comment file header We deployed this header to all the locale files, so make sure we include it in the generated ones too so we don't lose it. --- diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 2979c4a75ed..22aa68d99cc 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,14 @@ +2016-06-11 Mike Frysinger + + * unicode-gen/gen_translit_circle.py (output_head): Add write of + unicode_utils.COMMENT_HEADER. + * unicode-gen/gen_translit_cjk_compat.py (output_head): Likewise. + * unicode-gen/gen_translit_combining.py (output_head): Likewise. + * unicode-gen/gen_translit_compat.py (output_head): Likewise. + * unicode-gen/gen_translit_font.py (output_head): Likewise. + * unicode-gen/gen_translit_fraction.py (output_head): Likewise. + * unicode-gen/unicode_utils.py (COMMENT_HEADER): Define. + 2016-06-11 Mike Frysinger [BZ #19133] diff --git a/localedata/unicode-gen/gen_translit_circle.py b/localedata/unicode-gen/gen_translit_circle.py index 03d581849e0..eb59e7153a0 100644 --- a/localedata/unicode-gen/gen_translit_circle.py +++ b/localedata/unicode-gen/gen_translit_circle.py @@ -62,6 +62,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations of encircled characters.\n') translit_file.write('% Generated automatically from UnicodeData.txt ' diff --git a/localedata/unicode-gen/gen_translit_cjk_compat.py b/localedata/unicode-gen/gen_translit_cjk_compat.py index eecc9cc6eed..bea6f8b614a 100644 --- a/localedata/unicode-gen/gen_translit_cjk_compat.py +++ b/localedata/unicode-gen/gen_translit_cjk_compat.py @@ -63,6 +63,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations of CJK compatibility ') translit_file.write('characters.\n') diff --git a/localedata/unicode-gen/gen_translit_combining.py b/localedata/unicode-gen/gen_translit_combining.py index a60d11b707c..48742b53a71 100644 --- a/localedata/unicode-gen/gen_translit_combining.py +++ b/localedata/unicode-gen/gen_translit_combining.py @@ -62,6 +62,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations that remove all ') translit_file.write('combining characters (accents,\n') diff --git a/localedata/unicode-gen/gen_translit_compat.py b/localedata/unicode-gen/gen_translit_compat.py index 759e4ed082f..62d5e074773 100644 --- a/localedata/unicode-gen/gen_translit_compat.py +++ b/localedata/unicode-gen/gen_translit_compat.py @@ -62,6 +62,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations of compatibility characters ') translit_file.write('and ligatures.\n') diff --git a/localedata/unicode-gen/gen_translit_font.py b/localedata/unicode-gen/gen_translit_font.py index c6c55451f34..927f16db133 100644 --- a/localedata/unicode-gen/gen_translit_font.py +++ b/localedata/unicode-gen/gen_translit_font.py @@ -62,6 +62,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations of font equivalents.\n') translit_file.write('% Generated automatically from UnicodeData.txt ' diff --git a/localedata/unicode-gen/gen_translit_fraction.py b/localedata/unicode-gen/gen_translit_fraction.py index b14c23abef1..29fe0661aab 100644 --- a/localedata/unicode-gen/gen_translit_fraction.py +++ b/localedata/unicode-gen/gen_translit_fraction.py @@ -62,6 +62,7 @@ def output_head(translit_file, unicode_version, head=''): else: translit_file.write('escape_char /\n') translit_file.write('comment_char %\n') + translit_file.write(unicode_utils.COMMENT_HEADER) translit_file.write('\n') translit_file.write('% Transliterations of fractions.\n') translit_file.write('% Generated automatically from UnicodeData.txt ' diff --git a/localedata/unicode-gen/unicode_utils.py b/localedata/unicode-gen/unicode_utils.py index 8cc5f2ba2ae..18be6598167 100644 --- a/localedata/unicode-gen/unicode_utils.py +++ b/localedata/unicode-gen/unicode_utils.py @@ -25,6 +25,17 @@ Unicode data for glibc from upstream Unicode data files. import sys import re + +# Common locale header. +COMMENT_HEADER = """ +% This file is part of the GNU C Library and contains locale data. +% The Free Software Foundation does not claim any copyright interest +% in the locale data contained in this file. The foregoing does not +% affect the license of the GNU C Library as a whole. It does not +% exempt you from the conditions of the license if your use would +% otherwise be governed by that license. +""" + # Dictionary holding the entire contents of the UnicodeData.txt file # # Contents of this dictionary look like this: