From badaf8ffc6dc3238d239c00270446eb24661f8e1 Mon Sep 17 00:00:00 2001 From: AIOOB Date: Sat, 9 Jun 2018 14:14:11 +0100 Subject: [PATCH] Move to dual license, see #847 --- LICENSE => LICENSE-APACHE | 0 LICENSE-MIT | 23 +++++++++++++++++++++++ README.md | 4 ++-- appveyor.yml | 3 ++- src/backend/dx11/Cargo.toml | 2 +- src/backend/dx12/Cargo.toml | 2 +- src/backend/gl/Cargo.toml | 2 +- src/backend/metal/Cargo.toml | 2 +- src/backend/vulkan/Cargo.toml | 2 +- src/hal/Cargo.toml | 2 +- src/render/Cargo.toml | 2 +- src/warden/Cargo.toml | 2 +- 12 files changed, 35 insertions(+), 11 deletions(-) rename LICENSE => LICENSE-APACHE (100%) create mode 100644 LICENSE-MIT diff --git a/LICENSE b/LICENSE-APACHE similarity index 100% rename from LICENSE rename to LICENSE-APACHE diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 00000000000..31aa79387f2 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,23 @@ +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index a1b85e7694a..702ecde7d45 100644 --- a/README.md +++ b/README.md @@ -66,12 +66,12 @@ If you are looking for information about the released crates (`gfx_core`, `gfx`, [license]: #license -This repository is currently in the process of being licensed under either of +This repository is licensed under either of * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0) * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT) -at your option. Some parts of the repository are already licensed according to those terms. See the [tracking issue](https://github.com/gfx-rs/gfx/issues/847). +at your option. ## Contributions diff --git a/appveyor.yml b/appveyor.yml index ed01251b6c3..d1be8fe8a4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,8 @@ skip_commits: files: - travis.yml - bors.toml - - LICENSE + - LICENSE-APACHE + - LICENSE-MIT - '*.md' - src/backend/metal/* diff --git a/src/backend/dx11/Cargo.toml b/src/backend/dx11/Cargo.toml index 01db674be2b..b56d0083c4c 100644 --- a/src/backend/dx11/Cargo.toml +++ b/src/backend/dx11/Cargo.toml @@ -5,7 +5,7 @@ description = "DirectX-11 API backend for gfx-rs" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "README.md" documentation = "https://docs.rs/gfx-backend-dx11" diff --git a/src/backend/dx12/Cargo.toml b/src/backend/dx12/Cargo.toml index 7d0c240847e..8a04f24a9e9 100644 --- a/src/backend/dx12/Cargo.toml +++ b/src/backend/dx12/Cargo.toml @@ -5,7 +5,7 @@ description = "DirectX-12 API backend for gfx-rs" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "README.md" documentation = "https://docs.rs/gfx-backend-dx12" diff --git a/src/backend/gl/Cargo.toml b/src/backend/gl/Cargo.toml index e20763c6765..19074578643 100644 --- a/src/backend/gl/Cargo.toml +++ b/src/backend/gl/Cargo.toml @@ -5,7 +5,7 @@ description = "OpenGL backend for gfx-rs" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "README.md" documentation = "https://docs.rs/gfx-backend-gl" diff --git a/src/backend/metal/Cargo.toml b/src/backend/metal/Cargo.toml index 2c871c9c52c..b2c03d9fdfa 100644 --- a/src/backend/metal/Cargo.toml +++ b/src/backend/metal/Cargo.toml @@ -5,7 +5,7 @@ description = "Metal API backend for gfx-rs" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "README.md" documentation = "https://docs.rs/gfx-backend-metal" diff --git a/src/backend/vulkan/Cargo.toml b/src/backend/vulkan/Cargo.toml index 26ef1a5acc2..37678c8776c 100644 --- a/src/backend/vulkan/Cargo.toml +++ b/src/backend/vulkan/Cargo.toml @@ -5,7 +5,7 @@ description = "Vulkan API backend for gfx-rs" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "README.md" documentation = "https://docs.rs/gfx-device-vulkan" diff --git a/src/hal/Cargo.toml b/src/hal/Cargo.toml index 3a66ebf78f7..6442db87f55 100644 --- a/src/hal/Cargo.toml +++ b/src/hal/Cargo.toml @@ -5,7 +5,7 @@ description = "gfx-rs hardware abstraction layer" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] documentation = "https://docs.rs/gfx-hal" workspace = "../.." diff --git a/src/render/Cargo.toml b/src/render/Cargo.toml index 80cef5498c7..df28a967329 100644 --- a/src/render/Cargo.toml +++ b/src/render/Cargo.toml @@ -5,7 +5,7 @@ description = "gfx-rs higher rendering layer" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "../../README.md" documentation = "https://docs.rs/gfx-render" diff --git a/src/warden/Cargo.toml b/src/warden/Cargo.toml index d69c5aa7452..8d85ea58da6 100644 --- a/src/warden/Cargo.toml +++ b/src/warden/Cargo.toml @@ -5,7 +5,7 @@ description = "gfx-rs reftest framework" homepage = "https://github.com/gfx-rs/gfx" repository = "https://github.com/gfx-rs/gfx" keywords = ["graphics", "gamedev"] -license = "Apache-2.0" +license = "MIT OR Apache-2.0" authors = ["The Gfx-rs Developers"] readme = "../../README.md" documentation = "https://docs.rs/gfx-render"