diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-03-01 02:41:14 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-03-01 02:41:14 +0000 |
| commit | f0fed3a3b634b8c5991947dc472d9a8e5a65d7b6 (patch) | |
| tree | aba4e005e56616f396132f3be9191d5281fabc7e | |
| parent | 8ba85d852669213fb96aca1cc5449d3789c315e2 (diff) | |
| download | gdb-f0fed3a3b634b8c5991947dc472d9a8e5a65d7b6.zip gdb-f0fed3a3b634b8c5991947dc472d9a8e5a65d7b6.tar.gz gdb-f0fed3a3b634b8c5991947dc472d9a8e5a65d7b6.tar.bz2 | |
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.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/copyright.py | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2cc117e..6338c4c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 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 gnulib's git repository. * copyright.py: Set UPDATE_COPYRIGHT_USE_INTERVALS environment diff --git a/gdb/copyright.py b/gdb/copyright.py index 180e7c4..e8f2833 100644 --- 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 |