feat/licenses (#155)

* chore(license): add template Signed-off-by: Daniel Thompson-Yvetot <[email protected]> * chore(license): examples Signed-off-by: Daniel Thompson-Yvetot <[email protected]> * chore(license): add SPDX licenses Signed-off-by: Daniel Thompson-Yvetot <[email protected]> * chore(authors): name tauri programme Signed-off-by: Daniel Thompson-Yvetot <[email protected]> * fix(cargo): proper license naming Signed-off-by: Daniel Thompson-Yvetot <[email protected]>
tauri-apps · Apr 14, 2021 · db64fc6 · db64fc6
1 parent c1b3525
commit db64fc6
Show file tree

Hide file tree

Showing 33 changed files with 142 additions and 5 deletions.
diff --git a/.changes/license.md b/.changes/license.md
@@ -0,0 +1,6 @@
+---
+"wry": minor
+---
+
+Wry now accepts multiple custom protocol registerations.
+
diff --git a/.changes/protocols.md b/.changes/protocols.md
@@ -1,6 +1,5 @@
 ---
-"wry": minor
+"wry": patch
 ---
 
-Wry now accepts multiple custom protocol registerations.
-
+Apply license header for SPDX compliance.
diff --git a/.license_template b/.license_template
@@ -0,0 +1,3 @@
+// Copyright {20\d{2}(-20\d{2})?} Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,9 +3,9 @@ workspace = { }
 [package]
 name = "wry"
 version = "0.7.0"
-authors = [ "Ngo Iok Ui <[email protected]>" ]
+authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2018"
-license = "Apache-2.0/MIT"
+license = "Apache-2.0 OR MIT"
 description = "Cross-platform WebView rendering library"
 readme = "README.md"
 repository = "https://github.com/tauri-apps/wry"

diff --git a/LICENSE.spdx b/LICENSE.spdx
@@ -0,0 +1,20 @@
+SPDXVersion: SPDX-2.1
+DataLicense: CC0-1.0
+PackageName: wry
+DataFormat: SPDXRef-1
+PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
+PackageHomePage: https://tauri.app
+PackageLicenseDeclared: Apache-2.0
+PackageLicenseDeclared: MIT
+PackageCopyrightText: 2019-2021, The Tauri Programme in the Commons Conservancy
+PackageSummary: <text>Wry is the official, rust-based webview
+windowing service for Tauri.
+                </text>
+PackageComment: <text>The package includes the following libraries; see
+Relationship information.
+                </text>
+Created: 2020-05-20T09:00:00Z
+PackageDownloadLocation: git://github.com/tauri-apps/wry
+PackageDownloadLocation: git+https://github.com/tauri-apps/tauri.git
+PackageDownloadLocation: git+ssh://github.com/tauri-apps/wry.git
+Creator: Person: Daniel Thompson-Yvetot
diff --git a/build.rs b/build.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 #[cfg(target_os = "linux")]
 fn main() {}
 

diff --git a/examples/custom_titlebar.rs b/examples/custom_titlebar.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use wry::{Application, Attributes, Result, RpcRequest, WindowProxy, WindowRpcHandler};
 
 fn main() -> Result<()> {

diff --git a/examples/custom_user_data.rs b/examples/custom_user_data.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::{fs, path::PathBuf};
 use wry::{Application, Attributes, Result};
 

diff --git a/examples/dragndrop.rs b/examples/dragndrop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use wry::{Application, Attributes, Result};
 
 static TEST_HTML: &str = r#"data:text/html,

diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use wry::{Application, Attributes, Result};
 
 fn main() -> Result<()> {

diff --git a/examples/gtk.rs b/examples/gtk.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 #[cfg(not(target_os = "linux"))]
 fn main() {}
 

diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use wry::{Application, Attributes, Result};
 
 fn main() -> Result<()> {

diff --git a/examples/multi_window.rs b/examples/multi_window.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use serde_json::Value;
 use wry::{Application, Attributes, Result, RpcRequest, WindowProxy};
 

diff --git a/examples/rpc.rs b/examples/rpc.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use wry::{Application, Attributes, Result, RpcRequest, RpcResponse, WindowProxy};

diff --git a/examples/transparent.rs b/examples/transparent.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use wry::{Application, Attributes, Result};
 
 fn main() -> Result<()> {

diff --git a/examples/winit.rs b/examples/winit.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 #[cfg(target_os = "linux")]
 fn main() {}
 

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -12,3 +12,4 @@ use_try_shorthand = false
 use_field_init_shorthand = false
 force_explicit_abi = true
 imports_granularity = "Crate"
+license_template_path = ".license_template"
diff --git a/src/application/attributes.rs b/src/application/attributes.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use crate::{Result, RpcRequest, RpcResponse, WindowProxy};
 
 use std::{

diff --git a/src/application/general.rs b/src/application/general.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use crate::{
   application::{InnerWebViewAttributes, InnerWindowAttributes},
   ApplicationProxy, Attributes, CustomProtocol, Error, Event as WryEvent, Icon, Message, Result,

diff --git a/src/application/gtkrs.rs b/src/application/gtkrs.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use crate::{
   application::{InnerWebViewAttributes, InnerWindowAttributes},
   ApplicationProxy, Attributes, CustomProtocol, Error, Event as WryEvent, Icon, Message, Result,

diff --git a/src/application/mod.rs b/src/application/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 #[cfg(not(target_os = "linux"))]
 mod general;
 #[cfg(not(target_os = "linux"))]

diff --git a/src/file_drop.rs b/src/file_drop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::path::PathBuf;
 
 use crate::WindowProxy;

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 //! Wry is a Cross-platform WebView rendering library.
 //!
 //! There are two main ways to build WebView windows: [`Application`] and build by yourself.

diff --git a/src/webview/linux/file_drop.rs b/src/webview/linux/file_drop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::{cell::Cell, path::PathBuf, rc::Rc};
 
 use gtk::WidgetExt;

diff --git a/src/webview/linux/mod.rs b/src/webview/linux/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::{path::PathBuf, rc::Rc};
 
 use gdk::RGBA;

diff --git a/src/webview/macos/file_drop.rs b/src/webview/macos/file_drop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::{
   ffi::{c_void, CStr},
   path::PathBuf,

diff --git a/src/webview/macos/mod.rs b/src/webview/macos/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::{
   ffi::{c_void, CStr},
   os::raw::c_char,

diff --git a/src/webview/mimetype.rs b/src/webview/mimetype.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use std::fmt;
 
 const MIMETYPE_PLAIN: &str = "text/plain";

diff --git a/src/webview/mod.rs b/src/webview/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 //! [`WebView`] struct and associated types.
 
 mod mimetype;

diff --git a/src/webview/win32/file_drop.rs b/src/webview/win32/file_drop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use crate::{FileDropEvent, FileDropHandler};
 
 // A silly implementation of file drop handling for Windows!

diff --git a/src/webview/win32/mod.rs b/src/webview/win32/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 mod file_drop;
 
 use crate::{webview::mimetype::MimeType, FileDropHandler, Result, RpcHandler};

diff --git a/src/webview/winrt/file_drop.rs b/src/webview/winrt/file_drop.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 use windows::{Abi, Interface};
 
 use windows_webview2::Windows::Win32::{

diff --git a/src/webview/winrt/mod.rs b/src/webview/winrt/mod.rs
@@ -1,3 +1,7 @@
+// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
 mod file_drop;
 
 use windows_webview2::{