diff --git a/LICENSE.Apache-2.0 b/LICENSE.Apache-2.0 new file mode 100644 index 0000000..0f5dd9d --- /dev/null +++ b/LICENSE.Apache-2.0 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "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. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright 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 + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent 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 + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Gay Pizza Specifications + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + 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. diff --git a/LICENSE b/LICENSE.MIT similarity index 100% rename from LICENSE rename to LICENSE.MIT diff --git a/README.md b/README.md index b7e7efa..019e5dd 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Some say it can parse your arguments. Crates version - - MIT License + + MIT OR Apache-2.0 License @@ -58,6 +58,7 @@ println!("{file:?} -> {out:?} (number: {number:?})", ### Changelog ### main: + * Change licence from `MIT` to `MIT OR Apache-2.0`. * Moved `Opts::parse_map` into newly introduced `alloc` crate, making it accessible for `no_std` users. * More generic & flexible help API: removed forced newline, moved error writer to `StandardErrorUsageWriter`, generalised "Usage" line in standard full writer, enough public constructs to roll a custom help writer. @@ -86,3 +87,8 @@ Long term: ### Projects using jaarg (very cool) ### * [lbminfo](https://github.com/ScrelliCopter/colourcyclinginthehousetonight/tree/main/lbminfo) + +### Licensing ### + +jaarg is dual-licensed under either the [MIT](LICENSE.MIT) or [Apache 2.0](LICENSE.Apache-2.0) licences. +Pick whichever works best for your project. diff --git a/jaarg-nostd/examples/basic_nostd.rs b/jaarg-nostd/examples/basic_nostd.rs index 476b4ca..0e9c645 100644 --- a/jaarg-nostd/examples/basic_nostd.rs +++ b/jaarg-nostd/examples/basic_nostd.rs @@ -1,6 +1,6 @@ /* basic_nostd - jaarg example program using parse in `no_std` * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ #![no_std] diff --git a/jaarg-nostd/examples/btreemap_nostd.rs b/jaarg-nostd/examples/btreemap_nostd.rs index 6c88f52..44b89a9 100644 --- a/jaarg-nostd/examples/btreemap_nostd.rs +++ b/jaarg-nostd/examples/btreemap_nostd.rs @@ -1,6 +1,6 @@ /* btreemap_nostd - jaarg example program using BTreeMap in `no_std` * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ #![no_std] diff --git a/jaarg-nostd/src/harness.rs b/jaarg-nostd/src/harness.rs index fd326dd..87c608e 100644 --- a/jaarg-nostd/src/harness.rs +++ b/jaarg-nostd/src/harness.rs @@ -1,6 +1,6 @@ /* jaarg-nostd - Minimal harness to run examples in no_std on desktop * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ //!! [Okay... ready for the pain?](https://media.tenor.com/cJRcMyUAiMcAAAAC/tenor.gif) diff --git a/jaarg-nostd/src/simplepathbuf.rs b/jaarg-nostd/src/simplepathbuf.rs index 1dea9fb..1e7d696 100644 --- a/jaarg-nostd/src/simplepathbuf.rs +++ b/jaarg-nostd/src/simplepathbuf.rs @@ -1,6 +1,6 @@ /* jaarg-nostd - Minimal harness to run examples in no_std on desktop * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ use alloc::format; diff --git a/jaarg/examples/basic.rs b/jaarg/examples/basic.rs index 34f5fcf..780fa3b 100644 --- a/jaarg/examples/basic.rs +++ b/jaarg/examples/basic.rs @@ -1,6 +1,6 @@ /* basic - jaarg example program using parse_easy * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ use jaarg::{Opt, OptHide, Opts, ParseControl, ParseResult}; diff --git a/jaarg/examples/bin2h.rs b/jaarg/examples/bin2h.rs index 367847e..b094358 100644 --- a/jaarg/examples/bin2h.rs +++ b/jaarg/examples/bin2h.rs @@ -1,6 +1,6 @@ /* bin2c - jaarg example application * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ use jaarg::{Opt, Opts, ParseControl, ParseResult}; diff --git a/jaarg/examples/btreemap.rs b/jaarg/examples/btreemap.rs index 18b4bf3..31196ab 100644 --- a/jaarg/examples/btreemap.rs +++ b/jaarg/examples/btreemap.rs @@ -1,6 +1,6 @@ /* btreemap - jaarg example program using BTreeMap * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ use jaarg::{alloc::ParseMapResult, Opt, Opts}; diff --git a/jaarg/src/alloc.rs b/jaarg/src/alloc.rs index 75ae8c4..1e732a0 100644 --- a/jaarg/src/alloc.rs +++ b/jaarg/src/alloc.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ extern crate alloc; diff --git a/jaarg/src/argparse.rs b/jaarg/src/argparse.rs index b192679..938a2b5 100644 --- a/jaarg/src/argparse.rs +++ b/jaarg/src/argparse.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ /// Enum describing the result of parsing arguments, and how the program should behave. diff --git a/jaarg/src/const_utf8.rs b/jaarg/src/const_utf8.rs index ff7cc9d..5d9e3fe 100644 --- a/jaarg/src/const_utf8.rs +++ b/jaarg/src/const_utf8.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ /// Fully const fn nostd UTF-8 character iterator. diff --git a/jaarg/src/help.rs b/jaarg/src/help.rs index 51db722..6d2b3f1 100644 --- a/jaarg/src/help.rs +++ b/jaarg/src/help.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ /// Enough context to show full help text. diff --git a/jaarg/src/lib.rs b/jaarg/src/lib.rs index 2e5cd72..c2cc087 100644 --- a/jaarg/src/lib.rs +++ b/jaarg/src/lib.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ #![no_std] diff --git a/jaarg/src/option.rs b/jaarg/src/option.rs index 55a4ee9..2c46431 100644 --- a/jaarg/src/option.rs +++ b/jaarg/src/option.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ #[derive(Debug, Copy, Clone, PartialEq)] diff --git a/jaarg/src/options.rs b/jaarg/src/options.rs index 694e816..8f49b9b 100644 --- a/jaarg/src/options.rs +++ b/jaarg/src/options.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ /// Static structure that contains instructions for parsing command-line arguments. diff --git a/jaarg/src/ordered_bitset.rs b/jaarg/src/ordered_bitset.rs index 3fc080c..959a378 100644 --- a/jaarg/src/ordered_bitset.rs +++ b/jaarg/src/ordered_bitset.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ #![allow(private_bounds)] diff --git a/jaarg/src/std.rs b/jaarg/src/std.rs index a14f83b..ee28484 100644 --- a/jaarg/src/std.rs +++ b/jaarg/src/std.rs @@ -1,6 +1,6 @@ /* jaarg - Argument parser * SPDX-FileCopyrightText: (C) 2025 Gay Pizza Specifications - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 */ extern crate std;