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

Add BSD 3-Clause license for macro extract_package_metadata #25

Merged
merged 3 commits into from
Jan 5, 2021

Conversation

Levi-Armstrong
Copy link
Member

@gavanderhoorn Is this the correct way to do this?

@Levi-Armstrong
Copy link
Member Author

More discussion here.

cmake_common_scripts/cmake/cmake_tools.cmake Outdated Show resolved Hide resolved
BSD 3-Clause License

Copyright (c) 2020, ABB Schweiz AG
Copyright (c) 2020, Southwest Research Institute
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure you should add this. SwRI hasn't added anything.

perhaps the entire "copyright" line shouldn't be here, as you're providing the license text itself, without attaching it to anything specific here.

The attribution would then be close to the snippet you copied.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure you should add this. SwRI hasn't added anything.

A few of the function are ones that I had added like configure_package, and those related discover gtest. Just noticed that SwRI copyright was not present.

Copy link
Member Author

@Levi-Armstrong Levi-Armstrong Jan 4, 2021

Choose a reason for hiding this comment

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

perhaps the entire "copyright" line shouldn't be here, as you're providing the license text itself, without attaching it to anything specific here.

Is this still relevant breaking out the code into a separate file?

Copy link
Member

Choose a reason for hiding this comment

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

I had understood you only added the BSD license file for the snippet we're discussing in ros-industrial/abb_robot_driver#8. If there is more BSD covered code, then of course you should do whatever it necessary.

Comment on lines 308 to 313
# This extracts package name and version to the following variables
# ${prefix}_extracted_name and ${prefix}_extracted_version
# This was taken from https://github.com/ros-industrial/abb_robot_driver, author Jon Tjerngren
# This was taken from https://github.com/ros-industrial/abb_robot_driver
# Author: Jon Tjerngren
# Copyright (c) 2020, ABB Schweiz AG
# License: BSD 3-Clause
Copy link
Member

Choose a reason for hiding this comment

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

I've seen projects separate out code under different licenses by storing things in separate files.

That would also make it easy to attach the appropriate license: you could just include the license header in the file which falls under that license.

You could then of course still include(..) that file in this one.

Copy link
Member Author

Choose a reason for hiding this comment

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

That works. Should I remove all LICENSE files from the repository?

Copy link
Member

Choose a reason for hiding this comment

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

No, I don't believe so.

I've just seen it done the way I described to avoid mixing different licenses in the same file.

Copy link
Member

@gavanderhoorn gavanderhoorn left a comment

Choose a reason for hiding this comment

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

Looks OK to me, but:

  • I'm only one of the authors of that snippet (@jontje is the other)
  • IANAL

@Levi-Armstrong
Copy link
Member Author

@jontje If you see any issue please let me know. I will merge for now.

@Levi-Armstrong Levi-Armstrong merged commit 93428fb into ros-industrial:master Jan 5, 2021
@jontje
Copy link

jontje commented Jan 8, 2021

@jontje If you see any issue please let me know. I will merge for now.

I don't see any issues.

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

Successfully merging this pull request may close these issues.

3 participants