Skip to content

Commit a5f9129

Browse files
author
Felix Exner
committed
Further elaborated license statements in README
1 parent 68894f4 commit a5f9129

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,20 @@ add_executable(db_client main.cpp)
9696
target_link_libraries(db_client ur_client_library::urcl)
9797
```
9898

99+
## License
100+
The majority of this library is licensed under the Apache-2.0 licensed. However, certain parts are
101+
licensed under different licenses:
102+
- The queue used inside the communication structures is originally written by Cameron Desrochers
103+
and is released under the BSD-2-Clause license.
104+
- The semaphore implementation used inside the queue implementation is written by Jeff Preshing and
105+
licensed under the zlib license
106+
- The Dockerfile used for the integration tests of this repository is originally written by Arran
107+
Hobson Sayers and released under the MIT license
108+
109+
While the main `LICENSE` file in this repository contains the Apache-2.0 license used for the
110+
majority of the work, the respective libraries of third-party components reside together with the
111+
code imported from those third parties.
112+
99113
## Library contents
100114
Currently, this library contains the following components:
101115
* **Basic primary interface:** The primary interface isn't fully implemented at the current state

include/ur_client_library/queue/LICENSE.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
This license applies to all the code in this repository except that written by third
2-
parties, namely the files in benchmarks/ext, which have their own licenses, and Jeff
3-
Preshing's semaphore implementation (used in the blocking queue) which has a zlib
4-
license (embedded in atomicops.h).
1+
This license applies to all the code in this folder except that written by third parties, namely
2+
Jeff Preshing's semaphore implementation (used in the blocking queue) which has a zlib license
3+
(embedded in atomicops.h).
54

65
Simplified BSD License:
76

package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<license>Apache-2.0</license>
1414
<license>BSD-2-Clause</license>
1515
<license>Zlib</license>
16+
<license>MIT</license>
1617

1718
<url type="website">http://wiki.ros.org/ur_client_library</url>
1819
<url type="bugtracker">https://github.com/UniversalRobots/Universal_Robots_Client_Library/issues</url>

0 commit comments

Comments
 (0)