From 6589a73fd3affb7e0a9ecebdb3731db87a4b456f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 10 Jan 2021 11:59:05 +0000 Subject: [PATCH] Makefile: Build files.make at build-time, and do not commit it media-scraper can make this from library/*.toml without online access so it's suitable for the build, now. Signed-off-by: Ian Jackson --- .gitignore | 1 + Makefile | 7 +- library/edited/files.make | 15 ---- library/wikimedia/files.make | 132 ----------------------------------- 4 files changed, 7 insertions(+), 148 deletions(-) delete mode 100644 library/edited/files.make delete mode 100644 library/wikimedia/files.make diff --git a/.gitignore b/.gitignore index a8ac9a42..8cbc7842 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ templates/CC-BY-SA-3.0 templates/CC-BY-SA-4.0 templates/otter_wasm.ns.d.ts save/lock +/library/*/files.make /library/*/*.usvg /library/*/*.coloured.svg *.tmp diff --git a/Makefile b/Makefile index f8372b6c..7339fc0d 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,9 @@ bundled-sources:: #---------- svg processing ---------- -include $(wildcard library/*/files.make) +LIBRARIES ?= $(basename $(wildcard library/*.toml)) + +include $(addsuffix /files.make, $(LIBRARIES)) USVG_PROCESSOR = usvg-processor LIBRARY_PROCESS_SVG = ./$(USVG_PROCESSOR) $@ $(wordlist 1,2,$^) '$(USVG_CMD) $(USVG_OPTIONS)' @@ -229,6 +231,9 @@ $(LIBRARY_FILES): $(USVG_PROCESSOR) $(USVG_BINARY) Makefile # actual command for each of $(LIBRARY_FILES) is in one of the files.make +library/%/files.make: media-scraper library/%.toml + ./$< --offline library/$*.toml + #---------- typescript ---------- templates/%.js: tsc-wrap tsconfig.json diff --git a/library/edited/files.make b/library/edited/files.make deleted file mode 100644 index 54d0640b..00000000 --- a/library/edited/files.make +++ /dev/null @@ -1,15 +0,0 @@ -LIBRARY_FILES += library/edited/chess-board.usvg -library/edited/chess-board.usvg: library/edited/chess-board.svg library/edited/LICENCE library/edited.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/edited/chess-b-portal-blue.usvg -library/edited/chess-b-portal-blue.usvg: library/edited/chess-b-portal-blue.svg library/edited/LICENCE library/edited.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/edited/chess-w-portal-blue.usvg -library/edited/chess-w-portal-blue.usvg: library/edited/chess-w-portal-blue.svg library/edited/LICENCE library/edited.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/edited/chess-b-portal-orange.usvg -library/edited/chess-b-portal-orange.usvg: library/edited/chess-b-portal-orange.svg library/edited/LICENCE library/edited.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/edited/chess-w-portal-orange.usvg -library/edited/chess-w-portal-orange.usvg: library/edited/chess-w-portal-orange.svg library/edited/LICENCE library/edited.toml - $(LIBRARY_PROCESS_SVG) diff --git a/library/wikimedia/files.make b/library/wikimedia/files.make deleted file mode 100644 index c2c7369d..00000000 --- a/library/wikimedia/files.make +++ /dev/null @@ -1,132 +0,0 @@ -LIBRARY_FILES += library/wikimedia/chess-w-P.usvg -library/wikimedia/chess-w-P.usvg: library/wikimedia/chess-w-P.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-B.usvg -library/wikimedia/chess-w-B.usvg: library/wikimedia/chess-w-B.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-R.usvg -library/wikimedia/chess-w-R.usvg: library/wikimedia/chess-w-R.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-K.usvg -library/wikimedia/chess-w-K.usvg: library/wikimedia/chess-w-K.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-Q.usvg -library/wikimedia/chess-w-Q.usvg: library/wikimedia/chess-w-Q.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-P.usvg -library/wikimedia/chess-b-P.usvg: library/wikimedia/chess-b-P.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-B.usvg -library/wikimedia/chess-b-B.usvg: library/wikimedia/chess-b-B.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-R.usvg -library/wikimedia/chess-b-R.usvg: library/wikimedia/chess-b-R.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-K.usvg -library/wikimedia/chess-b-K.usvg: library/wikimedia/chess-b-K.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-Q.usvg -library/wikimedia/chess-b-Q.usvg: library/wikimedia/chess-b-Q.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-P.usvg -library/wikimedia/chess-g-P.usvg: library/wikimedia/chess-g-P.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-B.usvg -library/wikimedia/chess-g-B.usvg: library/wikimedia/chess-g-B.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-R.usvg -library/wikimedia/chess-g-R.usvg: library/wikimedia/chess-g-R.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-K.usvg -library/wikimedia/chess-g-K.usvg: library/wikimedia/chess-g-K.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-Q.usvg -library/wikimedia/chess-g-Q.usvg: library/wikimedia/chess-g-Q.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-P.usvg -library/wikimedia/chess-r-P.usvg: library/wikimedia/chess-r-P.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-B.usvg -library/wikimedia/chess-r-B.usvg: library/wikimedia/chess-r-B.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-R.usvg -library/wikimedia/chess-r-R.usvg: library/wikimedia/chess-r-R.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-K.usvg -library/wikimedia/chess-r-K.usvg: library/wikimedia/chess-r-K.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-Q.usvg -library/wikimedia/chess-r-Q.usvg: library/wikimedia/chess-r-Q.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-P.usvg -library/wikimedia/chess-y-P.usvg: library/wikimedia/chess-y-P.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-B.usvg -library/wikimedia/chess-y-B.usvg: library/wikimedia/chess-y-B.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-R.usvg -library/wikimedia/chess-y-R.usvg: library/wikimedia/chess-y-R.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-K.usvg -library/wikimedia/chess-y-K.usvg: library/wikimedia/chess-y-K.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-Q.usvg -library/wikimedia/chess-y-Q.usvg: library/wikimedia/chess-y-Q.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-mann.usvg -library/wikimedia/chess-w-mann.usvg: library/wikimedia/chess-w-mann.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-mann.usvg -library/wikimedia/chess-b-mann.usvg: library/wikimedia/chess-b-mann.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-elephant.usvg -library/wikimedia/chess-w-elephant.usvg: library/wikimedia/chess-w-elephant.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-elephant.usvg -library/wikimedia/chess-b-elephant.usvg: library/wikimedia/chess-b-elephant.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-ship.usvg -library/wikimedia/chess-g-ship.usvg: library/wikimedia/chess-g-ship.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-ship.usvg -library/wikimedia/chess-r-ship.usvg: library/wikimedia/chess-r-ship.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-ship.usvg -library/wikimedia/chess-y-ship.usvg: library/wikimedia/chess-y-ship.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-commoner.usvg -library/wikimedia/chess-w-commoner.usvg: library/wikimedia/chess-w-commoner.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-commoner.usvg -library/wikimedia/chess-b-commoner.usvg: library/wikimedia/chess-b-commoner.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-N.usvg -library/wikimedia/chess-w-N.usvg: library/wikimedia/chess-w-N.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-N.usvg -library/wikimedia/chess-b-N.usvg: library/wikimedia/chess-b-N.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-g-N.usvg -library/wikimedia/chess-g-N.usvg: library/wikimedia/chess-g-N.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-r-N.usvg -library/wikimedia/chess-r-N.usvg: library/wikimedia/chess-r-N.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-y-N.usvg -library/wikimedia/chess-y-N.usvg: library/wikimedia/chess-y-N.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-zebra.usvg -library/wikimedia/chess-w-zebra.usvg: library/wikimedia/chess-w-zebra.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-zebra.usvg -library/wikimedia/chess-b-zebra.usvg: library/wikimedia/chess-b-zebra.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-w-knight-king.usvg -library/wikimedia/chess-w-knight-king.usvg: library/wikimedia/chess-w-knight-king.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/chess-b-knight-king.usvg -library/wikimedia/chess-b-knight-king.usvg: library/wikimedia/chess-b-knight-king.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -LIBRARY_FILES += library/wikimedia/mgmt-library-load-marker.usvg -library/wikimedia/mgmt-library-load-marker.usvg: library/wikimedia/mgmt-library-load-marker.svg library/wikimedia/LICENCE library/wikimedia.toml - $(LIBRARY_PROCESS_SVG) -- 2.30.2