Skip to content

Commit 1c9115b

Browse files
dneto0dneto0
authored
List all licenses in the root LICENSE file. (KhronosGroup#410)
Some files in the tools directory are licensed with something other than the Khronos license. Update the root LICENSE file to clearly point that out. The XML file is MIT-licensed. Also, massage the license text in a literal C++ string, so it can more easily be recognized by linting tools. This now passes license linting mechanisms inside Google.
1 parent 5aa1dd8 commit 1c9115b

File tree

2 files changed

+102
-23
lines changed

2 files changed

+102
-23
lines changed

‎LICENSE

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
Files: All files except for those called out below.
12
Copyright (c) 2015-2024 The Khronos Group Inc.
23

34
Permission is hereby granted, free of charge, to any person obtaining a
@@ -23,3 +24,80 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
2324
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
2425
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2526
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
27+
28+
---
29+
30+
Files: include/spirv/spir-v.xml
31+
Copyright (c) 2015-2024 The Khronos Group Inc.
32+
33+
Permission is hereby granted, free of charge, to any person obtaining a
34+
copy of this software and/or associated documentation files (the
35+
"Materials"), to deal in the Materials without restriction, including
36+
without limitation the rights to use, copy, modify, merge, publish,
37+
distribute, sublicense, and/or sell copies of the Materials, and to
38+
permit persons to whom the Materials are furnished to do so, subject to
39+
the following conditions:
40+
41+
The above copyright notice and this permission notice shall be included
42+
in all copies or substantial portions of the Materials.
43+
44+
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
45+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
46+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
47+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
48+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
49+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
50+
MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
51+
52+
---
53+
54+
Files: tools/buildHeaders/jsoncpp/*
55+
The JsonCpp library's source code, including accompanying documentation,
56+
tests and demonstration applications, are licensed under the following
57+
conditions...
58+
59+
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
60+
jurisdictions which recognize such a disclaimer. In such jurisdictions,
61+
this software is released into the Public Domain.
62+
63+
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
64+
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
65+
released under the terms of the MIT License (see below).
66+
67+
In jurisdictions which recognize Public Domain property, the user of this
68+
software may choose to accept it either as 1) Public Domain, 2) under the
69+
conditions of the MIT License (see below), or 3) under the terms of dual
70+
Public Domain/MIT License conditions described here, as they choose.
71+
72+
The MIT License is about as close to Public Domain as a license can get, and is
73+
described in clear, concise terms at:
74+
75+
http://en.wikipedia.org/wiki/MIT_License
76+
77+
The full text of the MIT License follows:
78+
79+
========================================================================
80+
Copyright (c) 2007-2010 Baptiste Lepilleur
81+
82+
Permission is hereby granted, free of charge, to any person
83+
obtaining a copy of this software and associated documentation
84+
files (the "Software"), to deal in the Software without
85+
restriction, including without limitation the rights to use, copy,
86+
modify, merge, publish, distribute, sublicense, and/or sell copies
87+
of the Software, and to permit persons to whom the Software is
88+
furnished to do so, subject to the following conditions:
89+
90+
The above copyright notice and this permission notice shall be
91+
included in all copies or substantial portions of the Software.
92+
93+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
94+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
95+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
96+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
97+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
98+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
99+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
100+
SOFTWARE.
101+
========================================================================
102+
103+
---

‎tools/buildHeaders/header.cpp

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -169,29 +169,30 @@ namespace {
169169
}
170170

171171
const std::string TPrinter::DocCopyright =
172-
"Copyright (c) 2014-2024 The Khronos Group Inc.\n"
173-
"\n"
174-
"Permission is hereby granted, free of charge, to any person obtaining a copy\n"
175-
"of this software and/or associated documentation files (the \"Materials\"),\n"
176-
"to deal in the Materials without restriction, including without limitation\n"
177-
"the rights to use, copy, modify, merge, publish, distribute, sublicense,\n"
178-
"and/or sell copies of the Materials, and to permit persons to whom the\n"
179-
"Materials are furnished to do so, subject to the following conditions:\n"
180-
"\n"
181-
"The above copyright notice and this permission notice shall be included in\n"
182-
"all copies or substantial portions of the Materials.\n"
183-
"\n"
184-
"MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS\n"
185-
"STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND\n"
186-
"HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ \n"
187-
"\n"
188-
"THE MATERIALS ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n"
189-
"OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n"
190-
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n"
191-
"THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n"
192-
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n"
193-
"FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS\n"
194-
"IN THE MATERIALS.\n";
172+
R"(Copyright (c) 2014-2024 The Khronos Group Inc.
173+
174+
Permission is hereby granted, free of charge, to any person obtaining a copy
175+
of this software and/or associated documentation files (the "Materials"),
176+
to deal in the Materials without restriction, including without limitation
177+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
178+
and/or sell copies of the Materials, and to permit persons to whom the
179+
Materials are furnished to do so, subject to the following conditions:
180+
181+
The above copyright notice and this permission notice shall be included in
182+
all copies or substantial portions of the Materials.
183+
184+
MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
185+
STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
186+
HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
187+
188+
THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
189+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
190+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
191+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
192+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
193+
FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
194+
IN THE MATERIALS.
195+
)";
195196

196197
const std::string TPrinter::DocComment1 =
197198
"This header is automatically generated by the same tool that creates\n"

0 commit comments

Comments
 (0)