From b702d78238eea12cfa8866b34d553b464c826585 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 09:57:12 -0600 Subject: [PATCH 01/10] new exception: SHL-2.1 --- src/SHL-2.1.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/SHL-2.1.xml diff --git a/src/SHL-2.1.xml b/src/SHL-2.1.xml new file mode 100644 index 000000000..a6523cd0c --- /dev/null +++ b/src/SHL-2.1.xml @@ -0,0 +1,42 @@ + + + + + https://solderpad.org/licenses/SHL-2.1/ + + Used with Apache-2.0 + + +

SOLDERPAD HARDWARE LICENSE VERSION 2.1

+
+

This license operates as a wraparound license to the Apache License Version 2.0 (the "Apache License") and incorporates the terms and conditions of the Apache License (which can be found here: http://apache.org/licenses/LICENSE-2.0), with the following additions and modifications. It must be read in conjunction with the Apache License. Section 1 below modifies definitions and terminology in the Apache License and Section 2 below replaces Section 2 of the Apache License. The Appendix replaces the Appendix in the Apache License. You may, at your option, choose to treat any Work released under this license as released under the Apache License (thus ignoring all sections written below entirely).

+ + + 1.Terminology in the Apache License is supplemented or modified as follows: +

"Authorship": any reference to 'authorship' shall be taken to read "authorship or design".

+

"Copyright owner": any reference to 'copyright owner' shall be taken to read "Rights owner".

+

"Copyright statement": the reference to 'copyright statement' shall be taken to read 'copyright or other statement pertaining to Rights'

+

The following new definition shall be added to the Definitions section of the Apache License:

+

"Rights" means copyright and any similar right including design right (whether registered or unregistered), rights in semiconductor topographies (mask works) and database rights (but excluding Patents and Trademarks).

+

The following definitions shall replace the corresponding definitions in the Apache License:

+

"License" shall mean this Solderpad Hardware License version 2.1, being the terms and conditions for use, manufacture, instantiation, adaptation, reproduction, and distribution as defined by Sections 1 through 9 of this document.

+

"Licensor" shall mean the Rights owner or entity authorized by the Rights owner that is granting the License.

+

"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship or design. For the purposes of this License, Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the Work and Derivative Works thereof.

+

"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object or material and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works).

+

"Source" form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files.

+

"Work" shall mean the work of authorship or design, whether in Source or Object form, made available under the License, as indicated by a notice relating to Rights that is included in or attached to the work (an example is provided in the Appendix below).

+
+ + 2.Grant of License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist. + +
+

APPENDIX

+

Copyright [yyyy] [name of copyright owner]

+

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0

+
You may obtain a copy of the License at
+
https://solderpad.org/licenses/SHL-2.1/
+

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+

See the License for the specific language governing permissions and limitations under the License.

+
+
+
\ No newline at end of file From 14ca01aea05e2a01e8fd0783f214823ee810c053 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 11:49:52 -0600 Subject: [PATCH 02/10] move to exceptions folder --- src/{ => exceptions}/SHL-2.1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/{ => exceptions}/SHL-2.1.xml (99%) diff --git a/src/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml similarity index 99% rename from src/SHL-2.1.xml rename to src/exceptions/SHL-2.1.xml index a6523cd0c..aacfb5d9c 100644 --- a/src/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -39,4 +39,4 @@

See the License for the specific language governing permissions and limitations under the License.

- \ No newline at end of file + From 6201bdf9460bf21629bd3facdbb8558db3dc94cf Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 12:01:16 -0600 Subject: [PATCH 03/10] Create SHL-2.1.txt --- test/simpleTestForGenerator/SHL-2.1.txt | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 test/simpleTestForGenerator/SHL-2.1.txt diff --git a/test/simpleTestForGenerator/SHL-2.1.txt b/test/simpleTestForGenerator/SHL-2.1.txt new file mode 100644 index 000000000..40035fddc --- /dev/null +++ b/test/simpleTestForGenerator/SHL-2.1.txt @@ -0,0 +1,48 @@ +SOLDERPAD HARDWARE LICENSE VERSION 2.1 + +This license operates as a wraparound license to the Apache License Version 2.0 (the "Apache License") and incorporates the terms and conditions of the Apache License (which can be found here: http://apache.org/licenses/LICENSE-2.0), with the following additions and modifications. It must be read in conjunction with the Apache License. Section 1 below modifies definitions and terminology in the Apache License and Section 2 below replaces Section 2 of the Apache License. The Appendix replaces the Appendix in the Apache License. You may, at your option, choose to treat any Work released under this license as released under the Apache License (thus ignoring all sections written below entirely). + +1. Terminology in the Apache License is supplemented or modified as follows: + +"Authorship": any reference to 'authorship' shall be taken to read "authorship or design". + +"Copyright owner": any reference to 'copyright owner' shall be taken to read "Rights owner". + +"Copyright statement": the reference to 'copyright statement' shall be taken to read 'copyright or other statement pertaining to Rights' + +The following new definition shall be added to the Definitions section of the Apache License: + +"Rights" means copyright and any similar right including design right (whether registered or unregistered), rights in semiconductor topographies (mask works) and database rights (but excluding Patents and Trademarks). + +The following definitions shall replace the corresponding definitions in the Apache License: + +"License" shall mean this Solderpad Hardware License version 2.1, being the terms and conditions for use, manufacture, instantiation, adaptation, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the Rights owner or entity authorized by the Rights owner that is granting the License. +  +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship or design. For the purposes of this License, Derivative Works shall not include works that remain reversibly separable from, or merely link (or bind by name) or physically connect to or interoperate with the Work and Derivative Works thereof. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form or the application of a Source form to physical material, including but not limited to compiled object code, generated documentation, the instantiation of a hardware design or physical object or material and conversions to other media types, including intermediate forms such as bytecodes, FPGA bitstreams, moulds, artwork and semiconductor topographies (mask works). + +"Source" form shall mean the preferred form for making modifications, including but not limited to source code, net lists, board layouts, CAD files, documentation source, and configuration files. + +"Work" shall mean the work of authorship or design, whether in Source or Object form, made available under the License, as indicated by a notice relating to Rights that is included in or attached to the work (an example is provided in the Appendix below). + +2. Grant of License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist. + + +APPENDIX + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0. +You may obtain a copy of the License at + +https://solderpad.org/licenses/SHL-2.1/ + +Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and limitations under the License. + + + + From 3eebbb3dc755393d38ff13e8d0d33e1afe716696 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 12:02:37 -0600 Subject: [PATCH 04/10] add missing period --- src/exceptions/SHL-2.1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index aacfb5d9c..c44933c63 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -32,7 +32,7 @@

APPENDIX

Copyright [yyyy] [name of copyright owner]

-

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0

+

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.


You may obtain a copy of the License at

https://solderpad.org/licenses/SHL-2.1/

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From f0b2e0b6286f54a1773befb30c93f8e72cd44d57 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 13:31:52 -0600 Subject: [PATCH 05/10] add markup to appendix optional tag and standard header tag --- src/exceptions/SHL-2.1.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index c44933c63..28ed75dce 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -30,13 +30,17 @@ 2.Grant of License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license under the Rights to reproduce, prepare Derivative Works of, make, adapt, repair, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form and do anything in relation to the Work as if the Rights did not exist. +

APPENDIX

+

Copyright [yyyy] [name of copyright owner]

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.


You may obtain a copy of the License at

https://solderpad.org/licenses/SHL-2.1/

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and limitations under the License.

- +
+
+ From 0c6e80461f34505b7f3c3bf54544a2420124367f Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Wed, 13 May 2020 23:19:32 -0600 Subject: [PATCH 06/10] fix br tags --- src/exceptions/SHL-2.1.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index 28ed75dce..a97619428 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -34,9 +34,9 @@

APPENDIX

Copyright [yyyy] [name of copyright owner]

-

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.

-
You may obtain a copy of the License at
-
https://solderpad.org/licenses/SHL-2.1/
+

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0. +
You may obtain a copy of the License at +
https://solderpad.org/licenses/SHL-2.1/

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and limitations under the License.

From 979d33f84b1dc0e17023c165065e6bb6c983865a Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 14 May 2020 10:55:20 -0400 Subject: [PATCH 07/10] Fix br tags and remove standardLicenseHeader Signed-off-by: Steve Winslow --- src/exceptions/SHL-2.1.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index a97619428..c9624b266 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -32,14 +32,12 @@

APPENDIX

-

Copyright [yyyy] [name of copyright owner]

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0. -
You may obtain a copy of the License at -
https://solderpad.org/licenses/SHL-2.1/

+

You may obtain a copy of the License at

+

https://solderpad.org/licenses/SHL-2.1/

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

See the License for the specific language governing permissions and limitations under the License.

-
From 073c4a571d422329788b802eeba6db8a9805d18b Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 14 May 2020 11:02:38 -0400 Subject: [PATCH 08/10] Add missing closing tag Signed-off-by: Steve Winslow --- src/exceptions/SHL-2.1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index c9624b266..e39acf5cd 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -33,7 +33,7 @@

APPENDIX

Copyright [yyyy] [name of copyright owner]

-

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0. +

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.

You may obtain a copy of the License at

https://solderpad.org/licenses/SHL-2.1/

Unless required by applicable law or agreed to in writing, any work distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

From 2b84dd74407412492e1edfe4f6f40936ff4ff82c Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 14 May 2020 11:33:31 -0400 Subject: [PATCH 09/10] SHL-2.1: Add SPDX identifier line to test file Signed-off-by: Steve Winslow --- test/simpleTestForGenerator/SHL-2.1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test/simpleTestForGenerator/SHL-2.1.txt b/test/simpleTestForGenerator/SHL-2.1.txt index 40035fddc..e5bed07ba 100644 --- a/test/simpleTestForGenerator/SHL-2.1.txt +++ b/test/simpleTestForGenerator/SHL-2.1.txt @@ -34,6 +34,7 @@ The following definitions shall replace the corresponding definitions in the Apa APPENDIX Copyright [yyyy] [name of copyright owner] +SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0. You may obtain a copy of the License at From d2397ad0e0dac0c225bceccd65833705853cd3ec Mon Sep 17 00:00:00 2001 From: Steve Winslow Date: Thu, 14 May 2020 11:34:41 -0400 Subject: [PATCH 10/10] SHL-2.1: Add SPDX identifier line to xml Signed-off-by: Steve Winslow --- src/exceptions/SHL-2.1.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/exceptions/SHL-2.1.xml b/src/exceptions/SHL-2.1.xml index e39acf5cd..4ea351676 100644 --- a/src/exceptions/SHL-2.1.xml +++ b/src/exceptions/SHL-2.1.xml @@ -33,6 +33,7 @@

APPENDIX

Copyright [yyyy] [name of copyright owner]

+

SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1

Licensed under the Solderpad Hardware License v 2.1 (the "License"); you may not use this file except in compliance with the License, or, at your option, the Apache License version 2.0.

You may obtain a copy of the License at

https://solderpad.org/licenses/SHL-2.1/