Update `license header` and `scripts` #8666

niklasad1 · 2018-05-19T20:10:59Z

Sorry for a huge PR but most of the changes are caused by updated scripts.

The major changes in this PR are:

Updated scripts/add_license.sh it will now replace the existing header it starts with // Copyright and ends with If not, see <http://www.gnu.org/licenses/>. or just add the header if no header is found
Added a new script that supresses duplicated empty lines

So, the most of important parts of this PR to review are:

sorpaas · 2018-05-20T03:56:04Z

dapps/js-glue/build.rs

@@ -8,12 +8,11 @@

 // Parity is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the


Regarding the extra space, I think it's actually intentional? Reading from Wikipedia this is something called "English spacing". And I do remember encounterings of this spacing strategy in my life.

And in particular, the original GPL text uses English spacing. https://www.gnu.org/licenses/gpl.txt

5chdn · 2018-05-20T09:30:12Z

ethcore/vm/src/return_data.rs

+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 // Parity is free software: you can redistribute it and/or modify


Please check what caused this to have two headers.

5chdn · 2018-05-20T09:33:01Z

rpc/src/v1/helpers/network_settings.rs

+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
 // Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.


Check double header.

5chdn · 2018-05-20T10:01:24Z

This PR kills my browser. I reported this to Github. I'll try to continue reviewing...

5chdn

More duplicated headers in:

util/rlp/benches/rlp.rs
util/rlp/src/error.rs
util/rlp/src/impls.rs
util/rlp/src/lib.rs
util/rlp/src/rlpin.rs
util/rlp/src/stream.rs
util/rlp/src/traits.rs
util/rlp/tests/tests.rs
util/rlp_compress/src/common.rs
util/rlp_compress/src/lib.rs

dvdplm · 2018-05-21T07:57:46Z

I noticed we have a few Cargo.toml that are missing the license key. Not sure if now is a good time to add those.

e.g.
ethcore/res/wasm-tests/gen/Cargo.toml
ethcore/wasm/run/Cargo.toml
ethstore/cli/Cargo.toml
util/mem/Cargo.toml
util/stats/Cargo.toml
util/trie-standardmap/Cargo.toml
etc

niklasad1 · 2018-05-21T13:15:41Z

Good point, I found that the following Cargo.tomls were missing license = "xxx"

./evmbin/Cargo.toml
./local-store/Cargo.toml
./ethash/Cargo.toml
./json/Cargo.toml
./util/kvdb/Cargo.toml
./util/rlp_derive/Cargo.toml
./util/using_queue/Cargo.toml
./util/error/Cargo.toml
./util/macros/Cargo.toml
./util/rlp_compress/Cargo.toml
./util/trie-standardmap/Cargo.toml
./util/kvdb-rocksdb/Cargo.toml
./util/mem/Cargo.toml
./util/path/Cargo.toml
./util/kvdb-memorydb/Cargo.toml
./util/dir/Cargo.toml
./util/version/Cargo.toml
./util/stats/Cargo.toml
./util/stop-guard/Cargo.toml
./util/migration-rocksdb/Cargo.toml
./util/unexpected/Cargo.toml
./ethkey/cli/Cargo.toml
./ethkey/Cargo.toml
./chainspec/Cargo.toml
./ethcore/service/Cargo.toml
./ethcore/evm/Cargo.toml
./ethcore/wasm/run/Cargo.toml
./ethcore/wasm/Cargo.toml
./ethcore/types/Cargo.toml
./ethcore/transaction/Cargo.toml
./ethcore/crypto/Cargo.toml
./ethcore/vm/Cargo.toml
./ethcore/res/wasm-tests/gen/Cargo.toml
./machine/Cargo.toml
./ethstore/cli/Cargo.toml
./ethstore/Cargo.toml
./whisper/Cargo.toml

However, I'm not sure if we should just append license = "GPL-3.0" if it's missing after [package] in Cargo.toml

And lastly, should it go into scripts/add_license.sh or in a separate script?

dvdplm · 2018-05-21T15:00:09Z

Maybe add a script that warns us about it but does not take any action? I can imagine situations where adding a mismatching or wrong license could ending real bad.
On the other hand, what are the legal implications for adding the wrong license to a the crate meta-data? I.e. if the LICENSE is a MIT license, but the crate accidentally got published as GPL3, then which is it? IANAL, but surely the actual LICENSE file must be what counts?

5chdn · 2018-05-22T11:32:49Z

I don't want to review this again. Can we maybe split the changes to the script from the changes to the actual headers?

obsolete

niklasad1 · 2018-05-22T12:28:49Z

@5chdn It is only two scripts that are changed:

Do you want me to revert the changes in them?

Otherwise if I think this PR should be good to go!

5chdn · 2018-05-22T13:13:29Z

No, sorry, thanks for pointing them out.

dvdplm

lgtm

5chdn · 2018-05-31T12:03:12Z

Let's merge this.

niklasad1 · 2018-05-31T12:37:09Z

Rebased!

5chdn · 2018-05-31T13:40:05Z

Something is wrong with the CI. Why is this job not linked @General-Beck ?

https://gitlab.parity.io/parity/parity/-/jobs/88542

niklasad1 · 2018-06-02T09:31:49Z

@5chdn it's good to go now 🥇

debris · 2018-06-04T08:19:39Z

merging before there are more conflicts ;)

5chdn · 2018-06-04T10:58:22Z

Thanks, Niklas :)

…rp_sync_on_light_client * 'master' of https://github.com/paritytech/parity: Remove Result wrapper from AccountProvider in RPC impls (openethereum#8763) Update `license header` and `scripts` (openethereum#8666) Remove HostTrait altogether (openethereum#8681) ethcore-sync: fix connection to peers behind chain fork block (openethereum#8710) Remove public node settings from cli (openethereum#8758)

…eric * origin/master: ethcore: fix ancient block error msg handling (#8832) CI: Fix docker tags (#8822) parity: fix indentation in sync logging (#8794) Removed obsolete IpcMode enum (#8819) Remove UI related settings from CLI (#8783) Remove windows tray and installer (#8778) docs: add changelogs for 1.10.6 and 1.11.3 (#8810) Fix ancient blocks queue deadlock (#8751) Disallow unsigned transactions in case EIP-86 is disabled (#8802) Fix evmbin compilation (#8795) Have space between feature cfg flag (#8791) rpc: fix address formatting in TransactionRequest Display (#8786) Conditionally compile ethcore public test helpers (#8743) Remove Result wrapper from AccountProvider in RPC impls (#8763) Update `license header` and `scripts` (#8666)

niklasad1 added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels May 19, 2018

sorpaas reviewed May 20, 2018

View reviewed changes

niklasad1 force-pushed the license-header/update branch 2 times, most recently from d5ec588 to 5d2fb0b Compare May 20, 2018 06:06

5chdn reviewed May 20, 2018

View reviewed changes

5chdn previously requested changes May 20, 2018

View reviewed changes

5chdn added this to the 1.12 milestone May 20, 2018

niklasad1 force-pushed the license-header/update branch from 5c7df76 to 6f934e7 Compare May 20, 2018 13:57

jamesray1 mentioned this pull request May 22, 2018

License maintainer Drops-of-Diamond/diamond_drops#40

Open

niklasad1 force-pushed the license-header/update branch from 8265277 to 9b77a04 Compare May 22, 2018 12:23

dvdplm approved these changes May 31, 2018

View reviewed changes

5chdn approved these changes May 31, 2018

View reviewed changes

5chdn added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 31, 2018

niklasad1 force-pushed the license-header/update branch from 9b77a04 to b6ea4b6 Compare May 31, 2018 12:19

niklasad1 added 3 commits June 2, 2018 10:20

Update add_license script

9143d84

run script

2b1a617

add remove duplicate lines script and run it

c6e718e

niklasad1 and others added 9 commits June 2, 2018 10:21

Revert changes English spaces

b5d2784

strip whitespaces

997d716

Revert GPL in files with apache/mit license

2fa5889

don't append gpl license in files with other lic

b1b14eb

Don't append gpl header in files with other lic.

bef6797

re-ran script

c413299

include c and cpp files too

7924e0b

remove duplicate header

213a4ce

rebase nit

4e0628b

niklasad1 force-pushed the license-header/update branch from b6ea4b6 to 4e0628b Compare June 2, 2018 08:42

niklasad1 added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Jun 2, 2018

debris approved these changes Jun 4, 2018

View reviewed changes

debris merged commit 98b7c07 into openethereum:master Jun 4, 2018

niklasad1 deleted the license-header/update branch June 4, 2018 11:36

ordian mentioned this pull request Jun 26, 2018

Use local parity-dapps-glue instead of crate published at crates.io #8983

Merged

5chdn mentioned this pull request Jan 5, 2019

misc: bump license header to 2019 #10135

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update `license header` and `scripts` #8666

Update `license header` and `scripts` #8666

niklasad1 commented May 19, 2018 •

edited

Loading

sorpaas May 20, 2018 •

edited

Loading

5chdn May 20, 2018

5chdn May 20, 2018

5chdn commented May 20, 2018

5chdn left a comment

dvdplm commented May 21, 2018

niklasad1 commented May 21, 2018 •

edited

Loading

dvdplm commented May 21, 2018

5chdn commented May 22, 2018

niklasad1 commented May 22, 2018

5chdn commented May 22, 2018

dvdplm left a comment

5chdn commented May 31, 2018

niklasad1 commented May 31, 2018

5chdn commented May 31, 2018

niklasad1 commented Jun 2, 2018 •

edited

Loading

debris commented Jun 4, 2018 •

edited

Loading

5chdn commented Jun 4, 2018

Update license header and scripts #8666

Update license header and scripts #8666

Conversation

niklasad1 commented May 19, 2018 • edited Loading

sorpaas May 20, 2018 • edited Loading

Choose a reason for hiding this comment

5chdn May 20, 2018

Choose a reason for hiding this comment

5chdn May 20, 2018

Choose a reason for hiding this comment

5chdn commented May 20, 2018

5chdn left a comment

Choose a reason for hiding this comment

dvdplm commented May 21, 2018

niklasad1 commented May 21, 2018 • edited Loading

dvdplm commented May 21, 2018

5chdn commented May 22, 2018

niklasad1 commented May 22, 2018

5chdn commented May 22, 2018

dvdplm left a comment

Choose a reason for hiding this comment

5chdn commented May 31, 2018

niklasad1 commented May 31, 2018

5chdn commented May 31, 2018

niklasad1 commented Jun 2, 2018 • edited Loading

debris commented Jun 4, 2018 • edited Loading

5chdn commented Jun 4, 2018

Update `license header` and `scripts` #8666

Update `license header` and `scripts` #8666

niklasad1 commented May 19, 2018 •

edited

Loading

sorpaas May 20, 2018 •

edited

Loading

niklasad1 commented May 21, 2018 •

edited

Loading

niklasad1 commented Jun 2, 2018 •

edited

Loading

debris commented Jun 4, 2018 •

edited

Loading