Merge #2133

2133: Move to dual license r=kvark a=AIOOB Dual license under Apache-2.0 and MIT. Now possible due to comments in #847. I think I have changed it everywhere the license comes up. Co-authored-by: AIOOB <[email protected]>
gfx-rs · Jun 9, 2018 · 68d1539 · 68d1539
2 parents 3e02707 + 09e7fdb
commit 68d1539
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 11 deletions.
diff --git a/LICENSE → LICENSE-APACHE b/LICENSE → LICENSE-APACHE
diff --git a/LICENSE-MIT 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"