Skip to content

Commit 3b2430d

Browse files
johnstonskjjohnstonskj
authored
chore(license): move to dual Apache-2.0 OR MIT
1 parent f21f791 commit 3b2430d

File tree

10 files changed

+208
-6
lines changed

10 files changed

+208
-6
lines changed

‎LICENSE‎ renamed to ‎LICENSE-APACHE.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/

‎LICENSE-MIT.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright 2025 Simon Johnston <[email protected]>
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

‎README.md‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,61 @@ creating any PR.
197197
The script [eldev-check.sh](https://gist.github.com/johnstonskj/6af5ef6866bfb1288f4962a6ba3ef418) may be useful to you if you do not have your own Eldev
198198
workflow.
199199

200-
## License
201-
202-
This package is released under the Apache License, Version 2.0. See the LICENSE
203-
file in the repository for details.
200+
## License(s)
201+
202+
The contents of this repository are made available under the following
203+
licenses:
204+
205+
### Apache-2.0
206+
207+
> ```text
208+
> Copyright 2023-2025 Simon Johnston <[email protected]>
209+
>
210+
> Licensed under the Apache License, Version 2.0 (the "License");
211+
> you may not use this file except in compliance with the License.
212+
> You may obtain a copy of the License at
213+
>
214+
> http://www.apache.org/licenses/LICENSE-2.0
215+
>
216+
> Unless required by applicable law or agreed to in writing, software
217+
> distributed under the License is distributed on an "AS IS" BASIS,
218+
> WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
219+
> See the License for the specific language governing permissions and
220+
> limitations under the License.
221+
> ```
222+
223+
See the enclosed file [LICENSE-APACHE](https://github.com/sdm-lang/emacs-sdml-mode/blob/main/LICENSE-APACHE).
224+
225+
### MIT
226+
227+
> ```text
228+
> Copyright 2023-2025 Simon Johnston <[email protected]>
229+
>
230+
> Permission is hereby granted, free of charge, to any person obtaining a copy
231+
> of this software and associated documentation files (the “Software”), to deal
232+
> in the Software without restriction, including without limitation the rights to
233+
> use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
234+
> the Software, and to permit persons to whom the Software is furnished to do so,
235+
> subject to the following conditions:
236+
>
237+
> The above copyright notice and this permission notice shall be included in all
238+
> copies or substantial portions of the Software.
239+
>
240+
> THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
241+
> INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
242+
> PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
243+
> HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
244+
> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
245+
> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
246+
> ```
247+
248+
See the enclosed file [LICENSE-MIT](https://github.com/sdm-lang/emacs-sdml-mode/blob/main/LICENSE-MIT).
249+
250+
### Contributions
251+
252+
Unless you explicitly state otherwise, any contribution intentionally submitted
253+
for inclusion in the work by you, as defined in the Apache-2.0 license, shall
254+
be dual licensed as above, without any additional terms or conditions.
204255
205256
## Changes
206257

‎sdml-mode-abbrev.el‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
;;; License:
66

7-
;; Copyright (c) 2023, 2024 Simon Johnston
7+
;; Copyright (c) 2023-2025 Simon Johnston
88
;;
99
;; Licensed under the Apache License, Version 2.0 (the "License");
1010
;; you may not use this file except in compliance with the License.
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Internal module.

‎sdml-mode-cli.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Internal module.

‎sdml-mode-ctags.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Minor mode to provide tagging of SDML (sdml-mode) source.

‎sdml-mode-hl.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Minor mode to provide highlighting of SDML (sdml-mode) source.

‎sdml-mode-hydra.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Definition of a Hydra interface for SDML actions.

‎sdml-mode-indent.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,25 @@
1818
;; See the License for the specific language governing permissions and
1919
;; limitations under the License.
2020

21+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
22+
;;
23+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
24+
;; of this software and associated documentation files (the “Software”), to deal
25+
;; in the Software without restriction, including without limitation the rights to
26+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
27+
;; the Software, and to permit persons to whom the Software is furnished to do so,
28+
;; subject to the following conditions:
29+
;;
30+
;; The above copyright notice and this permission notice shall be included in all
31+
;; copies or substantial portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
34+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
35+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
36+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
37+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
38+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
2140
;;; Commentary:
2241

2342
;; Minor mode to provide indentation when editing SDML (sdml-mode) source.

‎sdml-mode.el‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,25 @@
2222
;; See the License for the specific language governing permissions and
2323
;; limitations under the License.
2424

25+
;; Copyright 2023-2025 Simon Johnston <[email protected]>
26+
;;
27+
;; Permission is hereby granted, free of charge, to any person obtaining a copy
28+
;; of this software and associated documentation files (the “Software”), to deal
29+
;; in the Software without restriction, including without limitation the rights to
30+
;; use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
31+
;; the Software, and to permit persons to whom the Software is furnished to do so,
32+
;; subject to the following conditions:
33+
;;
34+
;; The above copyright notice and this permission notice shall be included in all
35+
;; copies or substantial portions of the Software.
36+
;;
37+
;; THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
38+
;; INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
39+
;; PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40+
;; HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
41+
;; OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
42+
;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
43+
2544
;;; Commentary:
2645

2746
;;

0 commit comments

Comments
 (0)