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 2979c4a75ed33977cd83228c79768140498f827f..22aa68d99cc7225c437ba42c6eb0d822bb1f1f6c 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,14 @@
+2016-06-11  Mike Frysinger  <vapier@gentoo.org>
+
+       * 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  <vapier@gentoo.org>
 
        [BZ #19133]

diff --git a/localedata/unicode-gen/gen_translit_circle.py b/localedata/unicode-gen/gen_translit_circle.py
index 03d581849e098f0019d026fb446ec3d301a43f10..eb59e7153a0f0e52ac332ba84d7ebf8543016727 100644 (file)
--- 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 eecc9cc6eed23d79315732156a861344df1981e8..bea6f8b614a18ad84cd5c9bf6cd5e720c245fdcd 100644 (file)
--- 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 a60d11b707c0c5cef0792841f7d93127dace15ad..48742b53a71d2176948b04bc1676b339087b60d1 100644 (file)
--- 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 759e4ed082f9fc77423c54f16edb6b76f9d4968a..62d5e0747734d93d6bb9b0097fe8c9faa0d5612c 100644 (file)
--- 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 c6c55451f34e42215d37c8549bbbdccf846810b7..927f16db133eef3d32de7efb6e4320219d3f72fb 100644 (file)
--- 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 b14c23abef17891c9dbfc830d9240605d37acf19..29fe0661aab56df3db1bf2569f1f4e1b7f1eafa5 100644 (file)
--- 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 8cc5f2ba2ae1593866d721cdc1db700418be8c88..18be6598167102014a4b4be721531c3cdac05166 100644 (file)
--- 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: