diff options
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/update-copyright.py | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index baa32bb5134..3a2491799e9 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2017-01-01 Jakub Jelinek <jakub@redhat.com> + + * update-copyright.py (TestsuiteFilter): Skip params/README. + (GCCCmdLine): Remove libjava and libjava/testsuite add_dir. + 2016-12-14 Martin Liska <mliska@suse.cz> * analyze_brprob.py: Add new column to output and new sorting diff --git a/contrib/update-copyright.py b/contrib/update-copyright.py index ebefa4627c3..de11a653407 100755 --- a/contrib/update-copyright.py +++ b/contrib/update-copyright.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright (C) 2013-2016 Free Software Foundation, Inc. +# Copyright (C) 2013-2017 Free Software Foundation, Inc. # # This script is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,9 +34,9 @@ # all copyright notices (and possibly at other times to check whether # new files have been added with old years). On the other hand: # -# update-copyright.pl --this-year libjava +# update-copyright.pl --this-year libitm # -# would run the script on just libjava/. +# would run the script on just libitm/. # # Note that things like --version output strings must be updated before # this script is run. There's already a separate procedure for that. @@ -585,6 +585,9 @@ class TestsuiteFilter (GenericFilter): # and isn't updated. if filename == 'README' and os.path.basename (dir) == 'g++.niklas': return True + # Similarly params/README. + if filename == 'README' and os.path.basename (dir) == 'params': + return True return GenericFilter.skip_file (self, dir, filename) class LibCppFilter (GenericFilter): @@ -732,8 +735,6 @@ class GCCCmdLine (CmdLine): self.add_dir ('libgomp') self.add_dir ('libiberty') self.add_dir ('libitm') - self.add_dir ('libjava', LibJavaFilter()) - self.add_dir (os.path.join ('libjava', 'testsuite'), TestsuiteFilter()) self.add_dir ('libobjc') # liboffloadmic is imported from upstream. self.add_dir ('libquadmath') |