Put license information in each generated uni-*.el

* admin/unidata/unidata-gen.el (unidata-gen-file):
Get Copyright line from copyright.html.
Put information in file header, not separate README.
(unidata-gen-charprop): Mention the source location.
* lisp/international/README: Remove file.

1 files changed, 16 insertions, 8 deletions

diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el
index 64e2babd4b9..e1e896ce29c 100644
--- a/admin/unidata/unidata-gen.el
+++ b/admin/unidata/unidata-gen.el
@@ -1401,19 +1401,26 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
             data-dir (or (pop command-line-args-left) default-directory)
             unidata-text-file (or (pop command-line-args-left)
                                   (expand-file-name "unidata.txt"))))
-  (let ((coding-system-for-write 'utf-8-unix)
-        (coding-system-for-read 'utf-8)
-        (unidata-dir data-dir))
+  (let* ((coding-system-for-write 'utf-8-unix)
+         (coding-system-for-read 'utf-8)
+         (unidata-dir data-dir)
+         (copyright (with-temp-buffer
+                      (insert-file-contents
+                       (expand-file-name "copyright.html" unidata-dir))
+                      (re-search-forward "^Copyright .*Unicode, Inc.")
+                      (match-string 0))))
     (or unidata-list (unidata-setup-list unidata-text-file))
     (let* ((basename (file-name-nondirectory file))
            (elt (assoc basename unidata-file-alist)))
       (or elt (user-error "Unknown output file: %s" basename))
       (or noninteractive (message "Generating %s..." file))
       (with-temp-file file
-        (insert ";; Copyright (C) 1991-2014 Unicode, Inc.
-;; This file was generated from the Unicode data files at
-;; http://www.unicode.org/Public/UNIDATA/.
-;; See lisp/international/README for the copyright and permission notice.\n")
+        (insert ";; " copyright "
+;; Generated from Unicode data files by unidata-gen.el.
+;; The sources for this file are found in the admin/unidata/ directory in
+;; the Emacs sources.  The Unicode data files are used under the
+;; Unicode Terms of Use, as contained in the file copyright.html in that
+;; same directory.\n")
         (dolist (proplist (cdr elt))
           (let ((prop (unidata-prop-prop proplist))
                 (index (unidata-prop-index proplist))
@@ -1443,7 +1450,8 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)."
 (defun unidata-gen-charprop (&optional charprop-file)
   (or charprop-file (setq charprop-file (pop command-line-args-left)))
   (with-temp-file charprop-file
-    (insert ";; Automatically generated by unidata-gen.el.\n")
+    (insert ";; Automatically generated by unidata-gen.el.\n"
+            ";; See the admin/unidata/ directory in the Emacs sources.\n")
     (dolist (elt unidata-file-alist)
       (dolist (proplist (cdr elt))
         (insert (format "(define-char-code-property '%S %S\n  %S)\n"