OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/copyright.py: Adapt after move of gnulib from gdb to toplevel 

gdb/ChangeLog:

	* copyright.py: Adapt after move of gnulib directory from gdb
	directory to toplevel directory.

(cherry picked from commit 51fd40020e)
This commit is contained in:
Joel Brobecker 2020-01-01 10:32:30 +04:00
parent 1458b0f311
commit a292f79fbd
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-01-01 Joel Brobecker <brobecker@adacore.com>
* copyright.py: Adapt after move of gnulib directory from gdb
directory to toplevel directory.
2020-01-01 Joel Brobecker <brobecker@adacore.com>
* copyright.py (main): Exit if run from the wrong directory.

15
gdb/copyright.py
View File

@ -45,7 +45,7 @@ def get_update_list():
the files are relative to that root directory.
"""
result = []
for gdb_dir in ('gdb', 'sim', 'include/gdb'):
for gdb_dir in ('gdb', 'gnulib', 'sim', 'include/gdb'):
for root, dirs, files in os.walk(gdb_dir, topdown=True):
for dirname in dirs:
reldirname = "%s/%s" % (root, dirname)
@ -80,7 +80,7 @@ def update_files(update_list):
os.environ['UPDATE_COPYRIGHT_USE_INTERVALS'] = '2'
# Perform the update, and save the output in a string.
update_cmd = ['bash', 'gdb/gnulib/import/extra/update-copyright']
update_cmd = ['bash', 'gnulib/import/extra/update-copyright']
update_cmd += update_list
p = subprocess.Popen(update_cmd, stdout=subprocess.PIPE,
@ -142,13 +142,14 @@ def may_have_copyright_notice(filename):
def main ():
"""The main subprogram."""
if not os.path.isfile("gnulib/import/extra/update-copyright"):
print "Error: This script must be called from the gdb directory."
sys.exit(1)
root_dir = os.path.dirname(os.getcwd())
os.chdir(root_dir)
if not (os.path.isdir('gdb') and
os.path.isfile("gnulib/import/extra/update-copyright")):
print "Error: This script must be called from the gdb directory."
sys.exit(1)
update_list = get_update_list()
update_files (update_list)
@ -185,7 +186,7 @@ def main ():
EXCLUDE_LIST = (
'gdb/nat/glibc_thread_db.h',
'gdb/CONTRIBUTE',
'gdb/gnulib/import'
'gnulib/import'
)
# Files which should not be modified, either because they are