Skip to content

Commit c84349a

Browse files
author
MarcoFalke
committed
Merge #16314: scripts and tools: Update copyright_header.py script
ca11606 Fix: "Bitcoin Core" -> "The Bitcoin Core" (Hennadii Stepanov) 621463d Drop no-longer-relevant copyright holder name (Hennadii Stepanov) 01fafe5 Include Objective-C source files (Hennadii Stepanov) Pull request description: Now the `copyright_header.py` script handles Objective-C source files `*.mm`: ``` src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm src/qt/macos_appnap.mm ``` Also the only occurrence of `Bitcoin Core Developers` replaced with ubiquitous `The Bitcoin Core developers`. EDITED: The reason to remove "Sam Rushing" is (on master): ``` $ git grep "Sam Rushing" contrib/devtools/copyright_header.py: "Sam Rushing\n", ``` ACKs for top commit: laanwj: code review ACK ca11606 Tree-SHA512: 446c8fc569f732a6758e765f64110d9faeeffabb69088dd081d7bb730255c87196da96cea51081f4bd49280049fa4ed2ae22091059cb0f89bdc4ef8dd5e63cf0
2 parents 2f717fb + ca11606 commit c84349a

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

contrib/devtools/copyright_header.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"src/univalue/",
3535
]
3636

37-
INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py']
37+
INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.mm', '*.py']
3838
INCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in INCLUDE]))
3939

4040
def applies_to_file(filename):
@@ -90,14 +90,12 @@ def compile_copyright_regex(copyright_style, year_style, name):
9090
EXPECTED_HOLDER_NAMES = [
9191
"Satoshi Nakamoto\n",
9292
"The Bitcoin Core developers\n",
93-
"Bitcoin Core Developers\n",
9493
"BitPay Inc\.\n",
9594
"University of Illinois at Urbana-Champaign\.\n",
9695
"Pieter Wuille\n",
9796
"Wladimir J. van der Laan\n",
9897
"Jeff Garzik\n",
9998
"Jan-Klaas Kollhof\n",
100-
"Sam Rushing\n",
10199
"ArtForz -- public domain half-a-node\n",
102100
"Intel Corporation",
103101
"The Zcash developers",

contrib/devtools/github-merge.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2016-2017 Bitcoin Core Developers
2+
# Copyright (c) 2016-2017 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -411,4 +411,3 @@ def main():
411411

412412
if __name__ == '__main__':
413413
main()
414-

0 commit comments

Comments
 (0)