Do not set MULTILINE_COMMENT_PREFIXES before calling update-copyright

This was a local hack to work around a limitation in update-copyright.
But the limitation is now OBE, because the copyright statements should
now always fit on a single line, thanks to the new policy of using
one single year range in the copyright notice.

gdb/ChangeLog:

        * copyright.py (MULTILINE_COMMENT_PREFIXES): Delete.
        (update_files): Do not set MULTILINE_COMMENT_PREFIXES
        environment variable before calling update-copyright.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2cc117e16b1f966865dfc405ff38ea2d3b8b4953..6338c4c1e977ee8cf7113829a52ca80f7a39ffa2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-01  Joel Brobecker  <brobecker@adacore.com>
+
+       * copyright.py (MULTILINE_COMMENT_PREFIXES): Delete.
+       (update_files): Do not set MULTILINE_COMMENT_PREFIXES
+       environment variable before calling update-copyright.
+
 2012-03-01  Joel Brobecker  <brobecker@adacore.com>
 
        * gnulib/extra/update-copyright: Update to the latest from

diff --git a/gdb/copyright.py b/gdb/copyright.py
index 180e7c43563703679c3532b78d8360ded5ce0c95..e8f283336c8880a458b9d2af1873a9a82b075d7a 100644 (file)
--- a/gdb/copyright.py
+++ b/gdb/copyright.py
@@ -35,14 +35,6 @@ import os
 import os.path
 import subprocess
 
-# A list of prefixes that start a multi-line comment.  These prefixes
-# should not be repeatead when wraping long lines.
-MULTILINE_COMMENT_PREFIXES = (
-    '/*',    # C/C++
-    '<!--',  # XML
-    '{',     # Pascal
-)
-
 
 def get_update_list():
     """Return the list of files to update.
@@ -80,10 +72,6 @@ def update_files(update_list):
 
     We use gnulib's update-copyright script for that.
     """
-    # Tell the update-copyright script that we do not want it to
-    # repeat the prefixes in MULTILINE_COMMENT_PREFIXES.
-    os.environ['MULTILINE_COMMENT_PREFIXES'] = \
-        '\n'.join(MULTILINE_COMMENT_PREFIXES)
     # We want to use year intervals in the copyright notices, and
     # all years should be collapsed to one single year interval,
     # even if there are "holes" in the list of years found in the