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

Update SPDX tags #4303

Merged
merged 28 commits into from
Oct 25, 2019
Merged

Update SPDX tags #4303

merged 28 commits into from
Oct 25, 2019

Conversation

sloriot
Copy link
Member

@sloriot sloriot commented Oct 18, 2019

Previous tags were deprecated

old tags being deprecated
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0$/SPDX-License-Identifier: GPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0$/SPDX-License-Identifier: LGPL-3.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0$/SPDX-License-Identifier: LGPL-2.0-only/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.1$" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.1$/SPDX-License-Identifier: LGPL-2.1-only/"
@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

@afabri please review Installation/LICENSE.COMMERCIAL

@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

With the last commits I also removed the license notice from the headers from most headers (but 2 files from the arrangement demo).

@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

TODO: licensecheck needs to be updated and travis will most probably crash for now.

@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

Travis should be happy now.

@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

I updated licensecheck to check for the absence of license notice in header files.

@sloriot
Copy link
Member Author

sloriot commented Oct 19, 2019

I would appreciate if this could go into 5.0

The license notice in the headers are not in the original headers
@sloriot
Copy link
Member Author

sloriot commented Oct 20, 2019

Note that the random forest license notice in the headers are not in the original distribution of the code. I added the license in Installation/LICENSE,RFL and update the SPDX tag to LicenseRef-RFL.

@lrineau lrineau added this to the 5.0-beta2 milestone Oct 21, 2019
@lrineau lrineau assigned lrineau and maxGimeno and unassigned lrineau Oct 21, 2019
lrineau added a commit that referenced this pull request Oct 22, 2019
@lrineau lrineau added the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Oct 25, 2019
@maxGimeno
Copy link
Contributor

lrineau added a commit that referenced this pull request Oct 25, 2019
@lrineau lrineau merged commit 5d1704b into CGAL:master Oct 25, 2019
@lrineau lrineau removed Under Testing Ready to be tested rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' labels Oct 25, 2019
@lrineau lrineau deleted the CGAL-SPDX_updates branch October 25, 2019 14:29
@sloriot
Copy link
Member Author

sloriot commented Oct 25, 2019

@pombredanne Thanks for the useful discussion at the GSoC mentor summit, license/SPDX clean up is now part of our master branch.

@pombredanne
Copy link

@sloriot this is great 🙇‍♂️
Glad I could be of help

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants