Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Licensing fixes #1030

Merged
merged 6 commits into from Dec 30, 2017

Conversation

Projects
None yet
2 participants
@illwieckz
Copy link
Member

illwieckz commented Oct 12, 2017

The very important changes are the ones in COPYING.txt:

  • remove non-free shaderlab exception
    there is no shaderlab's file anymore
  • remove non-GPL code from Wolf:ET source tree exception
    it was basically unzip, zlib, md4, jpeg, curl, ft2, and png
    they are now external.
  • add sgame/sg_api.cpp as BSD licensed exception
  • do not talk redirect to CC file, it's not there anymore
    keep the url

It fixes also some headers refering to Unvanquished or Daemon inconsistently, for example:

src/sgame/sg_spawn_mover.cpp

Daemon GPL Source Code
Copyright (C) 2012 Unvanquished Developers

This file is part of the Daemon GPL Source Code (Daemon Source Code).

Daemon Source Code is free software: you can redistribute it and/or modify

src/cgame/Filter.h

Copyright 2015 Unvanquished Developers

This file is part of Daemon.

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

Btw, all Daemon references in headers were replaced by Unvanquished ones.

It also unify some header spacing and line blanking.

It adds `Unvanquished GPL Source Code' mention to GPL headers when missing, so a simple recursive grep can find the related files.

There is still some files to be fixed because they don't have any header at all, you can find them this way:

find src -type f | sort > /tmp/srcfiles
grep -r 'Unvanquished .* Source Code' src | cut -f1 -d: | sort -u > /tmp/headfiles
comm -2 -3 /tmp/srcfiles /tmp/headfiles 

For example almost all files in src/sgame/components lack proper header, what to do with them?

Some look autogenerated, it would be nice to make the generator includes a license header too, and also check if all autogenerated files all contains a statement saying it's autogenerated (some have, I'm not sure all have).

Edit: See DaemonEngine/Daemon#48 for a similar PR on Daemon side.

@@ -2088,6 +2094,7 @@ static int CG_SortDistance( const void *a, const void *b )
CG_PlayerIsBuilder
==================
*/

This comment has been minimized.

@DolceTriade

DolceTriade Oct 12, 2017

Member

Need to fix regex? We shouldn't be adding extra lines everywhere

This comment has been minimized.

@illwieckz

illwieckz Oct 12, 2017

Author Member

that was just making comments consistent: in this kind of file there is random blank lines (or not) after each comment, it was half multiline comment plus blank line and half multiline comment without blank line… not very costly to unify that (i.e. I wrote the regexp to do that).

This comment has been minimized.

@DolceTriade

DolceTriade Oct 12, 2017

Member

We should do the opposite...remove the extra newline between comments and the start of the function.

This comment has been minimized.

@illwieckz

illwieckz Oct 12, 2017

Author Member

well, it's not related to licensing so it can be submitted as a separate PR, I removed that commit from this PR history.

illwieckz added some commits Oct 12, 2017

remove shaderlab and non-GPL Wolf:ET exceptions, fix #998
- remove non-free shaderlab exception
  there is no shaderlab's file anymore
- remove non-GPL code from Wolf:ET source tree exception
  it was basically unzip, zlib, md4, jpeg, curl, ft2, and png
  they are now external.
- add sgame/sg_api.cpp as BSD licensed exception
- do not talk redirect to CC file, it's not there anymore
  keep the url
headers: replace more Daemon reference to Unvanquished
that's files with missing 'Unvanquished .* Source Code'
reference

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from 6a9d87d to fac3965 Oct 12, 2017

@DolceTriade

This comment has been minimized.

Copy link
Member

DolceTriade commented Oct 12, 2017

LGTM

@illwieckz illwieckz force-pushed the illwieckz:licensing branch from fac3965 to 9b830e6 Oct 26, 2017

@illwieckz illwieckz referenced this pull request Oct 26, 2017

Merged

Licensing fixes #48

@illwieckz illwieckz merged commit 0d54c7c into Unvanquished:master Dec 30, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.