From 5ef4698c93677f971eda52b0467b78c13c3c2da8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 7 Sep 2020 00:31:59 +0100 Subject: [PATCH] SPDX notices Signed-off-by: Ian Jackson --- Makefile | 5 ++++- PROTOCOL.md | 5 +++++ demo/test.game.toml | 4 ++++ demo/test.table.toml | 4 ++++ msgpack-dump | 4 ++++ server.toml | 4 ++++ src/api.rs | 3 +++ src/bin/otter.rs | 4 +++- src/bin/server.rs | 3 +++ src/bin/slotmap-slot-idx-test.rs | 3 +++ src/cmdlistener.rs | 4 ++++ src/commands.rs | 3 +++ src/debugreader.rs | 3 +++ src/error.rs | 3 +++ src/gamestate.rs | 3 +++ src/global.rs | 4 ++++ src/http.rs | 3 +++ src/imports.rs | 3 +++ src/keydata.rs | 4 ++++ src/mgmtchannel.rs | 3 +++ src/pieces.rs | 4 ++++ src/session.rs | 3 +++ src/slotmap-slot-idx.rs | 4 ++++ src/spec.rs | 4 ++++ src/sse.rs | 4 ++++ src/updates.rs | 4 ++++ src/utils.rs | 3 +++ templates/loading.tera | 3 +++ templates/script.ts | 4 ++++ templates/session.tera | 4 +++- tsconfig.json | 3 +++ 31 files changed, 109 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9502d199..416cc4b9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ #!/bin/sh -# +# Copyright 2020 Ian Jackson +# SPDX-License-Identifier: AGPL-3.0-or-later +# There is NO WARRANTY. + # make -j8 # make -j8 release diff --git a/PROTOCOL.md b/PROTOCOL.md index 8d444662..362fe4e2 100644 --- a/PROTOCOL.md +++ b/PROTOCOL.md @@ -1,3 +1,8 @@ +Copyright 2020 Ian Jackson +SPDX-License-Identifier: AGPL-3.0-or-later +There is NO WARRANTY. + + CONCURRENT UPDATE PROTOCOL AND ANALYSIS ======================================= diff --git a/demo/test.game.toml b/demo/test.game.toml index 770d55b4..3ce5b310 100644 --- a/demo/test.game.toml +++ b/demo/test.game.toml @@ -1,3 +1,7 @@ +# Copyright 2020 Ian Jackson +# SPDX-License-Identifier: AGPL-3.0-or-later +# There is NO WARRANTY. + table_size = [300, 100] [[pieces]] diff --git a/demo/test.table.toml b/demo/test.table.toml index 4e956a4f..3f657804 100644 --- a/demo/test.table.toml +++ b/demo/test.table.toml @@ -1,3 +1,7 @@ +# Copyright 2020 Ian Jackson +# SPDX-License-Identifier: AGPL-3.0-or-later +# There is NO WARRANTY. + [[players]] nick = "alice" access = "FixedToken" diff --git a/msgpack-dump b/msgpack-dump index b9c82fd9..f7762633 100755 --- a/msgpack-dump +++ b/msgpack-dump @@ -1,4 +1,8 @@ #!/usr/bin/perl -w +# Copyright 2020 Ian Jackson +# SPDX-License-Identifier: AGPL-3.0-or-later +# There is NO WARRANTY. + use strict; use Data::MessagePack; use Data::Dumper; diff --git a/server.toml b/server.toml index 4426726f..d50c2cce 100644 --- a/server.toml +++ b/server.toml @@ -1,3 +1,7 @@ +# Copyright 2020 Ian Jackson +# SPDX-License-Identifier: AGPL-3.0-or-later +# There is NO WARRANTY. + # /volatile/rustcargo/Rustup/Game/server # target/debug/server ~ian/Rustup/Game/server/server.toml diff --git a/src/api.rs b/src/api.rs index 5809498a..90d9a5d9 100644 --- a/src/api.rs +++ b/src/api.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; use crate::http::*; diff --git a/src/bin/otter.rs b/src/bin/otter.rs index f8a2c3e3..c80d8456 100644 --- a/src/bin/otter.rs +++ b/src/bin/otter.rs @@ -1,4 +1,6 @@ -// +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. #![allow(unused_imports)] diff --git a/src/bin/server.rs b/src/bin/server.rs index a23c13f2..bfdcfa61 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. // xxx need button(s) to cause players to release grabs ? diff --git a/src/bin/slotmap-slot-idx-test.rs b/src/bin/slotmap-slot-idx-test.rs index 522a613a..08fc128e 100644 --- a/src/bin/slotmap-slot-idx-test.rs +++ b/src/bin/slotmap-slot-idx-test.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: MIT-0 OR AGPL-3.0-or-later +// There is NO WARRANTY. // results: // rustc 1.46.0-nightly --release diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs index 2ae738cf..407d427e 100644 --- a/src/cmdlistener.rs +++ b/src/cmdlistener.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + // management API implementation use crate::imports::*; diff --git a/src/commands.rs b/src/commands.rs index 143dbe40..b1408356 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; diff --git a/src/debugreader.rs b/src/debugreader.rs index 2139afd6..cda35723 100644 --- a/src/debugreader.rs +++ b/src/debugreader.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: MIT-0 OR AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; diff --git a/src/error.rs b/src/error.rs index 452cecf0..efb92a76 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; diff --git a/src/gamestate.rs b/src/gamestate.rs index 25ee9479..5bc4c0ca 100644 --- a/src/gamestate.rs +++ b/src/gamestate.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; diff --git a/src/global.rs b/src/global.rs index 3d09208d..c9492a11 100644 --- a/src/global.rs +++ b/src/global.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + #![allow(clippy::let_and_return)] use crate::imports::*; diff --git a/src/http.rs b/src/http.rs index 3b996521..04b696b3 100644 --- a/src/http.rs +++ b/src/http.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. pub use rocket::request::Request; pub use rocket::response::{Response,Responder}; diff --git a/src/imports.rs b/src/imports.rs index 0e671ac9..cdcefcd1 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. pub use std::io; pub use std::io::{BufReader,Read,BufRead,BufWriter,Write}; diff --git a/src/keydata.rs b/src/keydata.rs index 5ba8aab8..aa7c3b36 100644 --- a/src/keydata.rs +++ b/src/keydata.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + #![allow(clippy::many_single_char_names)] use crate::imports::*; diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs index e1b5cacf..edef163f 100644 --- a/src/mgmtchannel.rs +++ b/src/mgmtchannel.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; diff --git a/src/pieces.rs b/src/pieces.rs index 8203a38b..df4b1d5b 100644 --- a/src/pieces.rs +++ b/src/pieces.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + // pieces use crate::imports::*; diff --git a/src/session.rs b/src/session.rs index 5b66144f..6e0c8129 100644 --- a/src/session.rs +++ b/src/session.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. use crate::imports::*; use crate::http::*; diff --git a/src/slotmap-slot-idx.rs b/src/slotmap-slot-idx.rs index 05eb2d08..c6580d1b 100644 --- a/src/slotmap-slot-idx.rs +++ b/src/slotmap-slot-idx.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: MIT-0 OR AGPL-3.0-or-later +// There is NO WARRANTY. + #![allow(clippy::or_fun_call)] //! Provides a [`get_idx_key`](trait.KeyDataExt.html#tymethod.get_idx_version) method on diff --git a/src/spec.rs b/src/spec.rs index 4034146d..465b968c 100644 --- a/src/spec.rs +++ b/src/spec.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + // game specs use serde::{Serialize,Deserialize}; diff --git a/src/sse.rs b/src/sse.rs index ecf418e2..6e6e3374 100644 --- a/src/sse.rs +++ b/src/sse.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + #![allow(clippy::while_let_loop)] #![allow(clippy::blocks_in_if_conditions)] diff --git a/src/updates.rs b/src/updates.rs index fe3afb9b..11e09b33 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -1,3 +1,7 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. + // update messages from server to client use crate::imports::*; diff --git a/src/utils.rs b/src/utils.rs index 55117cb8..c46dee1d 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,3 +1,6 @@ +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. pub trait OrdExt : Ord + Sized { fn update_max(&mut self, new: Self) { diff --git a/templates/loading.tera b/templates/loading.tera index c16b24c0..d17c8d36 100644 --- a/templates/loading.tera +++ b/templates/loading.tera @@ -1,4 +1,7 @@ +

Loading!

diff --git a/templates/script.ts b/templates/script.ts index 2a2ac90d..12af4321 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -1,5 +1,9 @@ // -*- JavaScript -*- +// Copyright 2020 Ian Jackson +// SPDX-License-Identifier: AGPL-3.0-or-later +// There is NO WARRANTY. --> + // xxx deployment note: need a whole bunch of domains for SSE conn limit // xxx some way to choose faces / rotate diff --git a/templates/session.tera b/templates/session.tera index c73a8b7c..b6837514 100644 --- a/templates/session.tera +++ b/templates/session.tera @@ -3,7 +3,9 @@ data-us="{{player}}" data-gen="{{gen}}" data-load="{{ load | escape }}" - > +

Hi {{nick | escape}}!


 

diff --git a/tsconfig.json b/tsconfig.json
index 65935ae1..de9dc7cf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,3 +1,6 @@
+// Copyright 2020 Ian Jackson
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
 {
     "compilerOptions": {
         "lib": [
-- 
2.30.2