Merge pull request 'License housekeeping' (#38) from better-licensing into main

Reviewed-on: #38

apps/magpie/src/client.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use serde::Serialize;
 
 use std::os::unix::net::UnixStream;

apps/magpie/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pub mod client;
 pub mod protocol;
 

apps/magpie/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use glium::glutin::event_loop::EventLoopBuilder;
 
 use canary_magpie::service::*;

apps/magpie/src/protocol.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use std::collections::VecDeque;
 use std::io::{Read, Write};
 use std::marker::PhantomData;

apps/magpie/src/service/gl.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use canary::{DrawCommand, Vec2, PX_PER_MM};
 use glium::Surface;
 

apps/magpie/src/service/ipc.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use std::collections::HashMap;
 use std::ops::{Deref, DerefMut};
 use std::path::{Path, PathBuf};

apps/magpie/src/service/mod.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 pub mod gl;
 pub mod ipc;
 pub mod window;

apps/magpie/src/service/window.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::time::Instant;

apps/music-player/Cargo.toml

@@ -2,6 +2,7 @@
 name = "canary-music-player"
 version = "0.1.0"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [[bin]]
 name = "canary-music-player"

apps/music-player/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use serde::{Deserialize, Serialize};
 
 pub use serde;

apps/music-player/src/main.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use canary_music_player::*;
 use canary_magpie::client::MagpieClient;
 use canary_magpie::protocol::{CreatePanel, MagpieServerMsg};

scripts/music-player/Cargo.toml

@@ -2,6 +2,7 @@
 name = "canary-music-player-script"
 version = "0.1.0"
 edition = "2021"
+license = "AGPL-3.0-or-later"
 
 [lib]
 crate-type = ["cdylib"]

scripts/music-player/src/lib.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 

scripts/sao-ui/src/anim.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use crate::Color;
 use keyframe::EasingFunction;
 

scripts/sao-ui/src/draw.rs

@@ -1 +0,0 @@
-

scripts/sao-ui/src/lib.rs

@@ -1,10 +1,11 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 pub mod anim;
-pub mod draw;
 pub mod main_menu;
-pub mod panel;
 pub mod widgets;
 
 use canary_script::*;

scripts/sao-ui/src/main_menu.rs

@@ -1,3 +1,6 @@
+// Copyright (c) 2022 Marceline Cramer
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
 use crate::widgets::prelude::*;
 use crate::{DrawContext, Rect};
 

scripts/sao-ui/src/panel.rs

@@ -1 +0,0 @@
-

src/backend/mod.rs

@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Marceline Cramer
-// SDPX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: LGPL-3.0-or-later
 
 //! This module defines backends for WebAssembly execution.
 //!

src/backend/wasmtime.rs

@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Marceline Cramer
-// SDPX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: LGPL-3.0-or-later
 
 use std::ops::DerefMut;
 

src/lib.rs

@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Marceline Cramer
-// SDPX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: LGPL-3.0-or-later
 
 pub use canary_script::*;
 use parking_lot::{Mutex, RwLock};

src/text/glyph.rs

@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Marceline Cramer
-// SDPX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: LGPL-3.0-or-later
 
 use super::{AllsortsFont, Rect, Vec2};
 

src/text/mod.rs

@@ -1,5 +1,5 @@
 // Copyright (c) 2022 Marceline Cramer
-// SDPX-License-Identifier: LGPL-3.0-or-later
+// SPDX-License-Identifier: LGPL-3.0-or-later
 
 use super::{Color, DrawCommand, MeshIndex, MeshVertex, Rect, Vec2};