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

Standardize and fix copyright and licenses #2054

Merged
merged 3 commits into from
Mar 27, 2020
Merged

Conversation

terrelln
Copy link
Contributor

@terrelln terrelln commented Mar 27, 2020

  • All copyright lines now have -2020 instead of -present
  • All copyright lines include "Facebook, Inc"
  • All licenses are now standardized
  • Add a test that tests all files have valid licenses (2nd commit)
  • Add the test to circleci (3rd commit)

The copyright in threading.{h,c} is not changed because it comes from zstdmt. The copyright and license of divsufsort.{h,c} is not changed.

Fixes #2052

* All copyright lines now have -2020 instead of -present
* All copyright lines include "Facebook, Inc"
* All licenses are now standardized

The copyright in `threading.{h,c}` is not changed because it comes from
zstdmt.

The copyright and license of `divsufsort.{h,c}` is not changed.
Tests all `.h`, `.c`, `.py`, and `Makefile` files for valid copyright
and license lines. Excludes a small number of exceptions (threading, and
divsufsort).

* Copyright does not contains `present`
* Copyright contains `Facebook, Inc`
* Copyright contains the current year
* License contains exactly the lines we expect
@terrelln
Copy link
Contributor Author

CircleCI isn't running on my repo, which means it doesn't run on my PRs... It seems that I have ~100 jobs stuck as "running". To be investigated before landing.

Run it first because it is very fast (~1 second)
@terrelln
Copy link
Contributor Author

CircleCI is running on my PRs now, and the test passed as expected https://circleci.com/gh/facebook/zstd/5769?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link (first line is Pass!)

@terrelln
Copy link
Contributor Author

The FreeBSD failure seems unrelated.

@@ -12,6 +12,7 @@ jobs:
- run:
name: Test
command: |
./tests/test-license.py
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@terrelln terrelln merged commit 1665462 into facebook:dev Mar 27, 2020
# All rights reserved.
#
# This source code is licensed under both the BSD-style license (found in the
# LICENSE file in the root directory of this source tree) and the GPLv2 (found
# in the COPYING file in the root directory of this source tree).
# You may select, at your option, one of the above-listed licenses.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'at your discretion' sounds more natural to me than 'at your option'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but to change it we would have to talk to our lawyers, and it isn't worth the hassle unless the wording is causing problems for someone.

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.

License concern
4 participants