Merge #16314: scripts and tools: Update copyright_header.py script
ca11606858Fix: "Bitcoin Core" -> "The Bitcoin Core" (Hennadii Stepanov)621463d7dfDrop no-longer-relevant copyright holder name (Hennadii Stepanov)01fafe55a1Include 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 ACKca11606858Tree-SHA512: 446c8fc569f732a6758e765f64110d9faeeffabb69088dd081d7bb730255c87196da96cea51081f4bd49280049fa4ed2ae22091059cb0f89bdc4ef8dd5e63cf0
This commit is contained in:
2 files changed
+2
-5
No files matched your search
@@ -34,7 +34,7 @@ EXCLUDE_DIRS = [
|
|||||||
"src/univalue/",
|
"src/univalue/",
|
||||||
]
|
]
|
||||||
|
|
||||||
INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.py']
|
INCLUDE = ['*.h', '*.cpp', '*.cc', '*.c', '*.mm', '*.py']
|
||||||
INCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in INCLUDE]))
|
INCLUDE_COMPILED = re.compile('|'.join([fnmatch.translate(m) for m in INCLUDE]))
|
||||||
|
|
||||||
def applies_to_file(filename):
|
def applies_to_file(filename):
|
||||||
@@ -90,14 +90,12 @@ def compile_copyright_regex(copyright_style, year_style, name):
|
|||||||
EXPECTED_HOLDER_NAMES = [
|
EXPECTED_HOLDER_NAMES = [
|
||||||
"Satoshi Nakamoto\n",
|
"Satoshi Nakamoto\n",
|
||||||
"The Bitcoin Core developers\n",
|
"The Bitcoin Core developers\n",
|
||||||
"Bitcoin Core Developers\n",
|
|
||||||
"BitPay Inc\.\n",
|
"BitPay Inc\.\n",
|
||||||
"University of Illinois at Urbana-Champaign\.\n",
|
"University of Illinois at Urbana-Champaign\.\n",
|
||||||
"Pieter Wuille\n",
|
"Pieter Wuille\n",
|
||||||
"Wladimir J. van der Laan\n",
|
"Wladimir J. van der Laan\n",
|
||||||
"Jeff Garzik\n",
|
"Jeff Garzik\n",
|
||||||
"Jan-Klaas Kollhof\n",
|
"Jan-Klaas Kollhof\n",
|
||||||
"Sam Rushing\n",
|
|
||||||
"ArtForz -- public domain half-a-node\n",
|
"ArtForz -- public domain half-a-node\n",
|
||||||
"Intel Corporation",
|
"Intel Corporation",
|
||||||
"The Zcash developers",
|
"The Zcash developers",
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
# Copyright (c) 2016-2017 Bitcoin Core Developers
|
# Copyright (c) 2016-2017 The Bitcoin Core developers
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
@@ -411,4 +411,3 @@ def main():
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
||||||
Reference in new issue
Block a user