Skip to content

Commit 899aaac

Browse files
author
Cevap
committed
Merged in update-copyrights (pull request dashpay#64)
Update copyrights * update copyrights - add ion copyrights to scripts header 2013-2018 Bitcoin Core * update copyrights - add ion copyrights to scripts header 2014-2015 Bitcoin Core * update copyrights - add ion copyrights to scripts header 2014-2016 Bitcoin Core * update copyrights - add ion copyrights to scripts header 2014-2017 Bitcoin Core * update copyrights - add ion copyrights to scripts header 2015-2016 Bitcoin Core * update copyrights - add ion copyrights to scripts header 2017-2017 Bitcoin Core * Merged master into update-copyrights * Update copyrights - Rename ION Core to Ion Core - Update and correct copyrights on token functionality * Merged in update-copyrights-1 (pull request dashpay#67) Update copyrights Approved-by: Cevap Approved-by: ckti * Merge remote-tracking branch 'remotes/origin/master' into update-copyrights Approved-by: ckti
1 parent 1d11c15 commit 899aaac

File tree

496 files changed

+927
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+927
-88
lines changed

‎Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copyright (c) 2013-2016 The Bitcoin Core developers
22
# Copyright (c) 2014-2018 The Dash Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56
# Pattern rule to print variables, e.g. make print-top_srcdir

‎autogen.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#!/bin/sh
2+
# Copyright (c) 2013-2016 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
4+
# Distributed under the MIT software license, see the accompanying
5+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
6+
27
set -e
38
srcdir="$(dirname $0)"
49
cd "$srcdir"

‎contrib/devtools/copyright_header.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python3
22
# Copyright (c) 2016 The Bitcoin Core developers
33
# Copyright (c) 2019 The Dash Core developers
4+
# Copyright (c) 2020 The Ion Core developers
45
# Distributed under the MIT software license, see the accompanying
56
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
67

@@ -106,7 +107,16 @@ def compile_copyright_regex(copyright_style, year_style, name):
106107
"Jan-Klaas Kollhof\n",
107108
"Sam Rushing\n",
108109
"ArtForz -- public domain half-a-node\n",
110+
"The Dash Core developers\n",
111+
"The Dash Core developers +\*\n",
112+
"The Dash core developers\n",
113+
"The Dash developers\n",
114+
"The PIVX Core developers\n",
115+
"The PIVX Core developers +\*\n",
116+
"The PIVX core developers\n",
117+
"The PIVX developers\n",
109118
"The Ion Core developers\n",
119+
"The Ion Core developers +\*\n",
110120
"The Ion core developers\n",
111121
"The Ion developers\n",
112122
"cevap\n",
@@ -416,21 +426,21 @@ def exec_update_header_year(base_directory):
416426
Updates all the copyright headers of "The Ion Core developers" which were
417427
changed in a year more recent than is listed. For example:
418428
419-
// Copyright (c) <firstYear>-<lastYear> The Dash Core developers
429+
// Copyright (c) <firstYear>-<lastYear> The Ion Core developers
420430
421431
will be updated to:
422432
423-
// Copyright (c) <firstYear>-<lastModifiedYear> The Dash Core developers
433+
// Copyright (c) <firstYear>-<lastModifiedYear> The Ion Core developers
424434
425435
where <lastModifiedYear> is obtained from the 'git log' history.
426436
427437
This subcommand also handles copyright headers that have only a single year. In those cases:
428438
429-
// Copyright (c) <year> The Dash Core developers
439+
// Copyright (c) <year> The Ion Core developers
430440
431441
will be updated to:
432442
433-
// Copyright (c) <year>-<lastModifiedYear> The Dash Core developers
443+
// Copyright (c) <year>-<lastModifiedYear> The Ion Core developers
434444
435445
where the update is appropriate.
436446
@@ -463,7 +473,7 @@ def get_header_lines(header, start_year, end_year):
463473
return [line + '\n' for line in lines]
464474

465475
CPP_HEADER = '''
466-
// Copyright (c) %s The Dash Core developers
476+
// Copyright (c) %s The Ion Core developers
467477
// Distributed under the MIT software license, see the accompanying
468478
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
469479
'''
@@ -472,7 +482,7 @@ def get_cpp_header_lines_to_insert(start_year, end_year):
472482
return reversed(get_header_lines(CPP_HEADER, start_year, end_year))
473483

474484
PYTHON_HEADER = '''
475-
# Copyright (c) %s The Dash Core developers
485+
# Copyright (c) %s The Ion Core developers
476486
# Distributed under the MIT software license, see the accompanying
477487
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
478488
'''

‎contrib/devtools/optimize-pngs.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python3
22
# Copyright (c) 2014-2015 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56
'''

‎contrib/devtools/security-check.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python3
22
# Copyright (c) 2015-2016 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56
'''

‎contrib/devtools/test-security-check.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python2
22
# Copyright (c) 2015-2016 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56
'''

‎contrib/ion-cli.bash-completion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# bash programmable completion for ion-cli(1)
22
# Copyright (c) 2012-2016 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56

‎contrib/iond.bash-completion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# bash programmable completion for iond(1) and ion-qt(1)
22
# Copyright (c) 2012-2016 The Bitcoin Core developers
3+
# Copyright (c) 2018-2020 The Ion Core developers
34
# Distributed under the MIT software license, see the accompanying
45
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
56

‎contrib/linearize/linearize-data.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# linearize-data.py: Construct a linear, no-fork version of the chain.
44
#
55
# Copyright (c) 2013-2014 The Bitcoin Core developers
6+
# Copyright (c) 2018-2020 The Ion Core developers
67
# Distributed under the MIT software license, see the accompanying
78
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
89
#

‎contrib/linearize/linearize-hashes.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# linearize-hashes.py: List blocks in a linear, no-fork version of the chain.
44
#
55
# Copyright (c) 2013-2014 The Bitcoin Core developers
6+
# Copyright (c) 2018-2020 The Ion Core developers
67
# Distributed under the MIT software license, see the accompanying
78
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
89
#

0 commit comments

Comments
 (0)