From ca98892c67831d7604c47f9eab348467de19d873 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 2 Oct 2020 22:15:25 +0100 Subject: [PATCH] wip licence annotations Signed-off-by: Ian Jackson --- .gitignore | 1 + LICENCE | 5 +++++ Makefile | 5 ++++- media-scraper | 4 ---- src/bin/daemon-otter.rs | 2 +- templates/loading.tera | 9 +++++++-- templates/session.tera | 29 +++++++++++++++++++++++------ 7 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index fbdf62d3..2a32136a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ templates/script.js +templates/LICENCE.txt save/lock /library/*/*.usvg diff --git a/LICENCE b/LICENCE index 261ab961..323014ec 100644 --- a/LICENCE +++ b/LICENCE @@ -17,6 +17,11 @@ License v3 along with this program, in the file AGPL-3. If not, see . +You can download the complete source code of a running instance of +otter, by visiting the path /src. There should be a link at the +bottom of the page. + + Shape libraries --------------- diff --git a/Makefile b/Makefile index ff73a757..0d27f653 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,10 @@ USVG_PROCESSOR = usvg-processor LIBRARY_PROCESS_SVG = ./$(USVG_PROCESSOR) $@ $(wordlist 1,2,$^) '$(USVG) $(USVG_OPTIONS)' $(LIBRARY_FILES): $(USVG_PROCESSOR) Makefile -assets: templates/script.js libraries +assets: templates/script.js templates/LICENCE.txt libraries + +templates/LICENCE.txt: templates/%.txt: % + cp $< $@.new && mv -f $@.new $@ libraries: $(LIBRARY_FILES) diff --git a/media-scraper b/media-scraper index fe1ea922..d1abfd3f 100755 --- a/media-scraper +++ b/media-scraper @@ -1,10 +1,6 @@ #!/usr/bin/perl -w use strict; -# xxx copyright and source information in library svg as output by server -# xxx at least original filename should be svg sent to clients -# xxx should be mentioned in copyright statement at bottom of game page - use POSIX; use IO::Handle; use Carp; diff --git a/src/bin/daemon-otter.rs b/src/bin/daemon-otter.rs index a3fee207..420d35f7 100644 --- a/src/bin/daemon-otter.rs +++ b/src/bin/daemon-otter.rs @@ -24,7 +24,7 @@ fn index() -> Template { Template::render("test",&c) } -const RESOURCES : &[&str] = &["script.js", "style.css"]; +const RESOURCES : &[&str] = &["script.js", "style.css", "LICENCE.txt"]; #[derive(Debug)] struct CheckedResourceLeaf { pub safe : &'static str } diff --git a/templates/loading.tera b/templates/loading.tera index d17c8d36..ec7188dc 100644 --- a/templates/loading.tera +++ b/templates/loading.tera @@ -1,7 +1,12 @@ - + There is NO WARRANTY. + Source code for this running version is at /src --> + + + + +

Loading!

diff --git a/templates/session.tera b/templates/session.tera index f52107be..daccf8d6 100644 --- a/templates/session.tera +++ b/templates/session.tera @@ -2,10 +2,7 @@ data-ctoken="{{ctoken}}" data-us="{{player}}" data-gen="{{gen}}" - data-load="{{ load | escape }}" - + data-load="{{ load | escape }}">