Merge branch 'use-git-submodule'

* use-git-submodule: DOC: copyright.ini: apply MPL-2.0 to .gitmodules MISC: Makefile.mk: directly create and reference .dlcache/ for mkassets.sh MISC: Makefile.mk: mkassets: download builds tools before misc/mkassets.sh GITHUB: workflows/testing.yml: use `make mkassets` for release builds .gitignore: ignore .submodule-stamp UI: global.scss, index.html: move AnklangIcons to assets/ UI: Makefile.mk: copy anklangicons-*.tgz files to assets, remove download EXTERNAL: blobs4anklang: add tim-janik/blobs4anklang commit from 2023-09-21 21:04:16 git -C external/blobs4anklang/ checkout 7b0a4a68a1e9efbe68fc9761bef080995f4b4d6b UI: global.scss, index.html: move fork-awesome to assets/ UI: Makefile.mk: copy node_modules/fork-awesome to assets, remove download MISC: package.json.in: install [email protected] UI: Makefile.mk: use blobs4anklang/fonts/InterVariable.woff2, remove download EXTERNAL: blobs4anklang: add tim-janik/blobs4anklang commit from 2023-09-21 18:23:36 git submodule add --name blobs4anklang https://github.com/tim-janik/blobs4anklang.git external/blobs4anklang git -C external/blobs4anklang/ checkout 8da35f3914b9668bacc6755a8051a17051b07c3a Makefile.mk: skip `git submodule` in tarball builds Makefile.mk: dist: exclude unused external subdirs from tarball Makefile.mk: include submodule archives in dist tarball ASE: Makefile.mk: use blake3 submodule, remove download rule ASE: compress.cc: use external/blake3/c/blake3.h EXTERNAL: blake3: add BLAKE3-team/BLAKE3 version 1.3.1 git submodule add --name blake3 https://github.com/BLAKE3-team/BLAKE3.git external/blake3 git -C external/blake3/ checkout 1.3.1 ASE: Makefile.mk: use websocketpp submodule, remove download rule EXTERNAL: websocketpp: add zaphoyd/websocketpp version 0.8.2 git submodule add --name websocketpp https://github.com/zaphoyd/websocketpp.git external/websocketpp git -C external/websocketpp/ checkout 0.8.2 ASE: Makefile.mk: use clap submodule, remove download rule EXTERNAL: clap: add free-audio/clap version 1.1.1 git submodule add --name clap https://github.com/free-audio/clap.git external/clap git -C external/clap/ checkout 1.1.1 ASE: Makefile.mk: use rapidjson submodule, remove download rule EXTERNAL: rapidjson: add Tencent/rapidjson commit from 2022-05-24 10:03:13 git submodule add --name rapidjson https://github.com/Tencent/rapidjson.git external/rapidjson git checkout 232389d4f1012dddec4ef84861face2d2ba85709 Makefile.mk: update all submodules before building sources Makefile.mk: remove external/ subdir from ls-tree.lst MISC: mkcopyright.py: ignore dirs passed from `git ls-tree` on the CLI ASE: storage.cc: adjust old link to zlib-ng/minizip-ng/issues/433 ASE: minizip: build against external/minizip-ng/ ASE: Makefile.mk: use minizip-ng submodule, remove download rule EXTERNAL: minizip-ng: add zlib-ng/minizip-ng version 2.9.0 git submodule add --name minizip-ng https://github.com/zlib-ng/minizip-ng.git external/minizip-ng .gitignore: remove entries of files the build is not generating Signed-off-by: Tim Janik <[email protected]>
tim-janik · Sep 21, 2023 · 22cf347 · 22cf347
2 parents 0e21fc8 + fd2c87c
commit 22cf347
Show file tree

Hide file tree

Showing 22 changed files with 135 additions and 149 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -28,7 +28,7 @@ jobs:
         misc/cirun -u 1000 misc/version.sh
     - name: 'Build Dist Assets'
       run: |
-        misc/cirun -u 1000 misc/mkassets.sh
+        misc/cirun -u 1000 make mkassets
     - uses: actions/upload-artifact@v3
       with: { name: assets, path: assets/ }
     - name: 'Upload API Docs' # http://tim-janik.github.io/docs/anklang

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 /config-defaults\.mk
 /out/
 /TAGS
-/TODO\.md
-/BACKLOG\.md
 /rand/
+/\.submodule-stamp
 /\.dlcache/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,18 @@
+[submodule "minizip-ng"]
+	path = external/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git
+[submodule "rapidjson"]
+	path = external/rapidjson
+	url = https://github.com/Tencent/rapidjson.git
+[submodule "clap"]
+	path = external/clap
+	url = https://github.com/free-audio/clap.git
+[submodule "websocketpp"]
+	path = external/websocketpp
+	url = https://github.com/zaphoyd/websocketpp.git
+[submodule "blake3"]
+	path = external/blake3
+	url = https://github.com/BLAKE3-team/BLAKE3.git
+[submodule "blobs4anklang"]
+	path = external/blobs4anklang
+	url = https://github.com/tim-janik/blobs4anklang.git
diff --git a/Makefile.mk b/Makefile.mk
@@ -120,14 +120,22 @@ LS_TREE_LST ::= # added to by ls-tree.d
 $>/ls-tree.d: $(GITCOMMITDEPS)						| $>/
 	$(QGEN)
 	$Q if test -r .git ; then					\
-		git ls-tree -r --name-only HEAD	> $>/ls-tree.lst ;	\
+		git ls-tree -r --name-only HEAD				\
+		| grep -v '^external/' > $>/ls-tree.lst ;		\
 	   else								\
 		$(CP) ./ls-tree.lst $>/ls-tree.lst ;			\
 	   fi
 	$Q ( echo 'LS_TREE_LST += $$(strip '\\ 				\
 	     && sed 's/$$/ \\/' $>/ls-tree.lst && echo ')' ) > $@
 -include $>/ls-tree.d
 
+# == .submodule-stamp ==
+.submodule-stamp: $(GITCOMMITDEPS)
+	$(QGEN)
+	$Q test ! -e .git || git submodule update --init --recursive
+	$Q touch $@
+Makefile.mk: .submodule-stamp
+
 # == enduser targets ==
 all: FORCE
 check: FORCE
@@ -320,13 +328,24 @@ endef
 
 # == dist ==
 extradist ::= ChangeLog doc/copyright TAGS ls-tree.lst # doc/README
+dist_exclude := $(strip			\
+	external/rapidjson/bin		\
+	external/rapidjson/doc		\
+	external/websocketpp/test	\
+	external/clap/artwork		\
+	external/minizip-ng/test	\
+	external/minizip-ng/lib		\
+)
 dist: $(extradist:%=$>/%)
 	@$(eval distname := anklang-$(version_short))
 	$(QECHO) MAKE $(distname).tar.zst
 	$Q git describe --dirty | grep -qve -dirty || echo -e "#\n# $@: WARNING: working tree is dirty\n#"
 	$Q rm -rf $>/dist/$(distname)/ && mkdir -p $>/dist/$(distname)/ assets/
 	$Q $(CP) $>/ChangeLog assets/ChangeLog-$(version_short).txt
 	$Q git archive -o assets/$(distname).tar --prefix=$(distname)/ HEAD
+	$Q git submodule foreach \
+	  'git archive --prefix="$(distname)/$${displaypath}/" -o tmp~.tar HEAD && tar Af "$(abspath assets/$(distname).tar)" tmp~.tar && rm tmp~.tar'
+	$Q tar f assets/$(distname).tar --delete $(dist_exclude:%=$(distname)/%)
 	$Q cd $>/ && $(CP) --parents $(extradist) $(abspath $>/dist/$(distname))
 	$Q tar f assets/$(distname).tar --delete $(distname)/NEWS.md \
 	&& misc/mknews.sh				>  $>/dist/$(distname)/NEWS.md \

diff --git a/ase/Makefile.mk b/ase/Makefile.mk
@@ -11,7 +11,6 @@ ase/noglob.cc			::= ase/main.cc $(ase/gtk2wrap.sources) $(ase/jackdriver.sources
 ase/libsources.cc		::= $(filter-out $(ase/noglob.cc), $(wildcard ase/*.cc))
 ase/libsources.c		::= $(wildcard ase/*.c)
 ase/include.deps		::= $>/ase/sysconfig.h
-ase/include.deps		 += $>/external/rapidjson/rapidjson.h
 
 # == AnklangSynthEngine definitions ==
 lib/AnklangSynthEngine		::= $>/lib/AnklangSynthEngine
@@ -32,9 +31,6 @@ ase/AnklangSynthEngine.objects	::= $(sort \
 ase/AnklangSynthEngine.objects	 += $(devices/4ase.objects)
 ALL_TARGETS += $(lib/AnklangSynthEngine)
 
-# Work around legacy code in external/websocketpp/*.hpp
-ase/websocket.cc.FLAGS = -Wno-deprecated-dynamic-exception-spec
-
 # == AnklangSynthEngine-fma ==
 $(lib/AnklangSynthEngine)-fma:
 	$(QGEN)
@@ -109,95 +105,39 @@ int main (int argc, const char *argv[]) {
 }
 endef
 
-# == external/minizip ==
-$>/external/minizip/mz_zip.h: ase/Makefile.mk		| $>/external/
-	@ $(eval H := 80d745e1c8caf6f81f6457403b0d9212e8a138b2badd6060e8a5da8583da2551)
-	@ $(eval U := https://github.com/zlib-ng/minizip-ng/archive/refs/tags/2.9.0.tar.gz)
-	@ $(eval T := minizip-ng-2.9.0.tar.gz)
-	$(QECHO) FETCH "$U"
-	$Q cd $>/external/ && rm -rf minizip* \
-		$(call AND_DOWNLOAD_SHAURL, $H, $U, $T) && tar xf $T && rm $T
-	$Q ln -s $(T:.tar.gz=) $>/external/minizip
-	$Q test -e $@ && touch $@
-$(wildcard ase/*.cc ase/*.c): $>/external/minizip/mz_zip.h
-
-# == external/websocketpp ==
-$>/external/websocketpp/server.hpp: ase/Makefile.mk	| $>/external/
-	@ $(eval H := 6ce889d85ecdc2d8fa07408d6787e7352510750daa66b5ad44aacb47bea76755)
-	@ $(eval U := https://github.com/zaphoyd/websocketpp/archive/0.8.2.tar.gz)
-	@ $(eval T := websocketpp-0.8.2.tar.gz)
-	$(QECHO) FETCH "$U"
-	$Q cd $>/external/ && rm -rf websocketpp* \
-		$(call AND_DOWNLOAD_SHAURL, $H, $U, $T) && tar xf $T && rm $T
-	$Q ln -s $(T:.tar.gz=)/websocketpp $>/external/websocketpp
-	$Q test -e $@ && touch $@
-$>/external/websocketpp/config/asio_no_tls.hpp: $>/external/websocketpp/server.hpp
-ase/websocket.cc: $>/external/websocketpp/config/asio_no_tls.hpp
-
-# == external/rapidjson ==
-$>/external/rapidjson/rapidjson.h: ase/Makefile.mk	| $>/external/
-	@ $(eval H := b9290a9a6d444c8e049bd589ab804e0ccf2b05dc5984a19ed5ae75d090064806)
-	@ $(eval U := https://github.com/Tencent/rapidjson/archive/232389d4f1012dddec4ef84861face2d2ba85709.tar.gz)
-	@ $(eval T := rapidjson-232389d4f1012dddec4ef84861face2d2ba85709.tar.gz)
-	$(QECHO) FETCH "$U"
-	$Q cd $>/external/ && rm -rf rapidjson* \
-		$(call AND_DOWNLOAD_SHAURL, $H, $U, $T) && tar xf $T && rm $T
-	$Q ln -s $(T:.tar.gz=)/include/rapidjson $>/external/rapidjson
-	$Q test -e $@ && touch $@
-$(wildcard ase/*.cc): $>/external/rapidjson/rapidjson.h
-
-# == external/clap ==
-$>/external/clap/clap.h: ase/Makefile.mk		| $>/external/
-	@ $(eval H := eef67a38df6c20fd4cb79698772d35d30aefc2e1a8d5275a5169f58cd530333e)
-	@ $(eval U := https://github.com/free-audio/clap/archive/refs/tags/1.1.1.tar.gz)
-	@ $(eval T := clap-1.1.1.tar.gz)
-	$(QECHO) FETCH "$U"
-	$Q cd $>/external/ && rm -rf clap* \
-	     $(call AND_DOWNLOAD_SHAURL, $H, $U, $T) && tar xf $T && rm $T
-	$Q ln -s $(T:.tar.gz=)/include/clap $>/external/clap
-	$Q test -e $@ && touch $@
-$(wildcard ase/clap*.cc): $>/external/clap/clap.h
-
-# == external/blake3 ==
-$>/external/blake3/blake3.h: ase/Makefile.mk		| $>/external/
-	@ $(eval H := 112becf0983b5c83efff07f20b458f2dbcdbd768fd46502e7ddd831b83550109)
-	@ $(eval U := https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.1.tar.gz)
-	@ $(eval T := BLAKE3-1.3.1.tar.gz)
-	$(QECHO) FETCH "$U"
-	$Q cd $>/external/ && rm -rf blake3* \
-	     $(call AND_DOWNLOAD_SHAURL, $H, $U, $T) && tar xf $T && rm $T
-	$Q ln -s $(T:.tar.gz=)/c $>/external/blake3
-	$Q test -e $@ && touch $@
-ase/compress.cc: $>/external/blake3/blake3.h
-
 # == blake3impl.c ==
-$>/ase/blake3impl.c: $>/external/blake3/blake3.h	| $>/ase/
+$>/ase/blake3impl.c:		| $>/ase/
 	$(QGEN)
-	$Q echo -e '#ifdef __AVX512F__\n' ' #include "blake3/blake3_avx512.c"\n' '#endif' > $>/ase/blake3avx512.c
-	$Q echo -e '#ifdef __AVX2__\n'    ' #include "blake3/blake3_avx2.c"\n' '#endif'   > $>/ase/blake3avx2.c
-	$Q echo -e '#ifdef __SSE4_1__\n'  ' #include "blake3/blake3_sse41.c"\n' '#endif'  > $>/ase/blake3sse41.c
-	$Q echo -e '#ifdef __SSE2__\n'    ' #include "blake3/blake3_sse2.c"\n' '#endif'   > $>/ase/blake3sse2.c
+	$Q echo -e '#ifdef __AVX512F__\n' ' #include "external/blake3/c/blake3_avx512.c"\n' '#endif' > $>/ase/blake3avx512.c
+	$Q echo -e '#ifdef __AVX2__\n'    ' #include "external/blake3/c/blake3_avx2.c"\n' '#endif'   > $>/ase/blake3avx2.c
+	$Q echo -e '#ifdef __SSE4_1__\n'  ' #include "external/blake3/c/blake3_sse41.c"\n' '#endif'  > $>/ase/blake3sse41.c
+	$Q echo -e '#ifdef __SSE2__\n'    ' #include "external/blake3/c/blake3_sse2.c"\n' '#endif'   > $>/ase/blake3sse2.c
 	$Q echo -e '#ifndef __AVX512F__\n' ' #define BLAKE3_NO_AVX512\n' '#endif' >  $>/ase/blake3impl.c
 	$Q echo -e '#ifndef __AVX2__\n'    ' #define BLAKE3_NO_AVX2\n'   '#endif' >> $>/ase/blake3impl.c
 	$Q echo -e '#ifndef __SSE4_1__\n'  ' #define BLAKE3_NO_SSE41\n'  '#endif' >> $>/ase/blake3impl.c
 	$Q echo -e '#ifndef __SSE2__\n'    ' #define BLAKE3_NO_SSE2\n'   '#endif' >> $>/ase/blake3impl.c
-	$Q echo -e '#include "blake3/blake3.c"'                                   >> $>/ase/blake3impl.c
-	$Q echo -e '#include "blake3/blake3_portable.c"'                          >> $>/ase/blake3impl.c
-	$Q echo -e '#include "blake3/blake3_dispatch.c"'                          >> $>/ase/blake3impl.c
+	$Q echo -e '#include "external/blake3/c/blake3.c"'                                   >> $>/ase/blake3impl.c
+	$Q echo -e '#include "external/blake3/c/blake3_portable.c"'                          >> $>/ase/blake3impl.c
+	$Q echo -e '#include "external/blake3/c/blake3_dispatch.c"'                          >> $>/ase/blake3impl.c
 $>/ase/blake3avx512.c $>/ase/blake3avx2.c $>/ase/blake3sse41.c $>/ase/blake3sse2.c: $>/ase/blake3impl.c
 
 # == AnklangSynthEngine ==
+ASE_EXTERNAL_INCLUDES := $(strip	\
+	-Iexternal/clap/include		\
+	-Iexternal/rapidjson/include	\
+	-Iexternal/websocketpp		\
+)
 $(ase/AnklangSynthEngine.objects): $(ase/include.deps) $(ase/libase.deps)
-$(ase/AnklangSynthEngine.objects): EXTRA_INCLUDES ::= -Iexternal/ -I$> -I$>/external/ $(ASEDEPS_CFLAGS)
+$(ase/AnklangSynthEngine.objects): EXTRA_INCLUDES ::= $(ASE_EXTERNAL_INCLUDES) -I$> -I$>/external/ $(ASEDEPS_CFLAGS)
 $(lib/AnklangSynthEngine):						| $>/lib/
 $(call BUILD_PROGRAM, \
 	$(lib/AnklangSynthEngine), \
 	$(ase/AnklangSynthEngine.objects), \
 	$(lib/libase.so), \
 	$(BOOST_SYSTEM_LIBS) $(ASEDEPS_LIBS) $(ALSA_LIBS) -lzstd -ldl, \
 	../lib)
-# silence some websocketpp warnings
-$(ase/AnklangSynthEngine.objects): EXTRA_CXXFLAGS ::= -Wno-sign-promo
+# Work around legacy code in external/websocketpp/*.hpp
+ase/websocket.cc.FLAGS = -Wno-deprecated-dynamic-exception-spec -Wno-sign-promo
 
 # == jackdriver.so ==
 lib/jackdriver.so	     ::= $>/lib/jackdriver.so

diff --git a/ase/compress.cc b/ase/compress.cc
@@ -10,7 +10,7 @@
 #error "Missing <zstd.h> from libzstd-dev, please set CXXFLAGS and LDFLAGS"
 #endif
 #include <zstd.h>
-#include <blake3/blake3.h>
+#include "external/blake3/c/blake3.h"
 
 namespace Ase {
 

diff --git a/ase/minizip.c b/ase/minizip.c
@@ -2,15 +2,15 @@
 #define HAVE_ZLIB
 #include "minizip.h"
 
-#include "external/minizip/mz_zip.c"
-#include "external/minizip/mz_strm.c"
-#include "external/minizip/mz_crypt.c" // mz_crypt_crc32_update
-#include "external/minizip/mz_zip_rw.c"
-#include "external/minizip/mz_strm_buf.c"
-#include "external/minizip/mz_strm_mem.c"
-#include "external/minizip/mz_strm_zlib.c"
-#include "external/minizip/mz_strm_split.c"
-#include "external/minizip/mz_os.c"
-#include "external/minizip/mz_os_posix.c"
-#include "external/minizip/mz_strm_os_posix.c"
-//#include "external/minizip/mz_compat.c"
+#include "external/minizip-ng/mz_zip.c"
+#include "external/minizip-ng/mz_strm.c"
+#include "external/minizip-ng/mz_crypt.c" // mz_crypt_crc32_update
+#include "external/minizip-ng/mz_zip_rw.c"
+#include "external/minizip-ng/mz_strm_buf.c"
+#include "external/minizip-ng/mz_strm_mem.c"
+#include "external/minizip-ng/mz_strm_zlib.c"
+#include "external/minizip-ng/mz_strm_split.c"
+#include "external/minizip-ng/mz_os.c"
+#include "external/minizip-ng/mz_os_posix.c"
+#include "external/minizip-ng/mz_strm_os_posix.c"
+//#include "external/minizip-ng/mz_compat.c"
diff --git a/ase/minizip.h b/ase/minizip.h
@@ -8,17 +8,17 @@
 #define MZ_ZIP_NO_ENCRYPTION
 
 // Minizip API
-#include "external/minizip/mz.h"
-#include "external/minizip/mz_os.h"
-#include "external/minizip/mz_zip.h"
-#include "external/minizip/mz_strm.h"
-//#include "external/minizip/mz_crypt.h"
-#include "external/minizip/mz_strm_buf.h"
-#include "external/minizip/mz_strm_mem.h"
-#include "external/minizip/mz_strm_zlib.h"
-#include "external/minizip/mz_strm_split.h"
-#include "external/minizip/mz_strm_os.h"
-#include "external/minizip/mz_zip_rw.h"
-//#include "external/minizip/mz_compat.h"
+#include "external/minizip-ng/mz.h"
+#include "external/minizip-ng/mz_os.h"
+#include "external/minizip-ng/mz_zip.h"
+#include "external/minizip-ng/mz_strm.h"
+//#include "external/minizip-ng/mz_crypt.h"
+#include "external/minizip-ng/mz_strm_buf.h"
+#include "external/minizip-ng/mz_strm_mem.h"
+#include "external/minizip-ng/mz_strm_zlib.h"
+#include "external/minizip-ng/mz_strm_split.h"
+#include "external/minizip-ng/mz_strm_os.h"
+#include "external/minizip-ng/mz_zip_rw.h"
+//#include "external/minizip-ng/mz_compat.h"
 
 #endif // __ASE_MINIZIP_H__
diff --git a/ase/storage.cc b/ase/storage.cc
@@ -423,7 +423,7 @@ class StorageReader::Impl {
         mz_zip_file *file_info = nullptr;
         if (MZ_OK == mz_zip_reader_entry_get_info (reader, &file_info) && file_info->filename && file_info->filename[0])
           {
-            if (!strchr (file_info->filename, '/') && // see: https://github.com/nmoinvaz/minizip/issues/433
+            if (!strchr (file_info->filename, '/') && // see: https://github.com/zlib-ng/minizip-ng/issues/433
                 !strchr (file_info->filename, '\\'))
               list.push_back (file_info->filename);
           }

diff --git a/doc/copyright.ini b/doc/copyright.ini
@@ -28,6 +28,7 @@ patterns =
 files =
 	.gitattributes
 	.gitignore
+	.gitmodules
 	NEWS.md
 	README.md
 	devices/blepsynth/TODO

diff --git a/external/blake3 b/external/blake3
diff --git a/external/blobs4anklang b/external/blobs4anklang
diff --git a/external/clap b/external/clap
diff --git a/external/minizip-ng b/external/minizip-ng
diff --git a/external/rapidjson b/external/rapidjson
diff --git a/external/websocketpp b/external/websocketpp
diff --git a/misc/Makefile.mk b/misc/Makefile.mk
@@ -103,13 +103,22 @@ check-copyright: misc/mkcopyright.py doc/copyright.ini $>/ls-tree.lst
 	$Q misc/mkcopyright.py -b -u -e -c doc/copyright.ini $$(cat $>/ls-tree.lst)
 CHECK_TARGETS += $(if $(HAVE_GIT), check-copyright)
 
-# == appimage-runtime-zstd ==
-$>/appimagetools/appimage-runtime-zstd:					| $>/appimagetools/
-	$(QECHO) FETCH $(@F), linuxdeploy # fetch AppImage tools
-	$Q test -e $(ABSPATH_DLCACHE)/linuxdeploy-x86_64.AppImage \
-	|| ( curl -sfSL https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -o $(ABSPATH_DLCACHE)/linuxdeploy-x86_64.AppImage.tmp \
-	     && mv $(ABSPATH_DLCACHE)/linuxdeploy-x86_64.AppImage.tmp $(ABSPATH_DLCACHE)/linuxdeploy-x86_64.AppImage )
-	$Q $(CP) $(ABSPATH_DLCACHE)/linuxdeploy-x86_64.AppImage $(@D) && chmod +x $(@D)/linuxdeploy-x86_64.AppImage
-	$Q cd $(@D) $(call foreachpair, AND_DOWNLOAD_SHAURL, \
-		0c4c18bb44e011e8416fc74fb067fe37a7de97a8548ee8e5350985ddee1c0164 https://github.com/tim-janik/appimage-runtime/releases/download/21.6.0/appimage-runtime-zstd )
+# == appimagetools/appimage-runtime-zstd ==
+$>/appimagetools/appimage-runtime-zstd:			| $>/appimagetools/
+	$(QECHO) FETCH linuxdeploy, appimage-runtime-zstd
+	$Q mkdir -p .dlcache/
+	$Q test -e .dlcache/linuxdeploy-x86_64.AppImage \
+	|| ( curl -sfSL https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -o .dlcache/linuxdeploy-x86_64.AppImage.tmp \
+	     && chmod +x .dlcache/linuxdeploy-x86_64.AppImage.tmp \
+	     && mv .dlcache/linuxdeploy-x86_64.AppImage.tmp .dlcache/linuxdeploy-x86_64.AppImage )
+	$Q test -e .dlcache/appimage-runtime-zstd \
+	|| ( curl -sfSL https://github.com/tim-janik/appimage-runtime/releases/download/21.6.0/appimage-runtime-zstd -o .dlcache/appimage-runtime-zstd.tmp \
+	     && mv .dlcache/appimage-runtime-zstd.tmp .dlcache/appimage-runtime-zstd )
+	$Q $(CP) .dlcache/linuxdeploy-x86_64.AppImage .dlcache/appimage-runtime-zstd $(@D)
+
+# == mkassets ==
+# Let misc/mkassets.sh do the work, just pre-cache needed downloads
+mkassets: $>/appimagetools/appimage-runtime-zstd
+	$Q exec misc/mkassets.sh
+.PHONY: mkassets
 CLEANDIRS += $>/mkdeb/
diff --git a/misc/mkcopyright.py b/misc/mkcopyright.py
@@ -94,7 +94,11 @@ def parse_years (yearstring):
 year_range = re.compile (r'([1-9][0-9][0-9][0-9]|[0-9][0-9])\b\s*[—-]\s*([1-9][0-9][0-9][0-9]|[0-9][0-9])\b')
 
 def open_as_utf8 (filename):
-  for line in open (filename, 'rb'):
+  try:
+    ofile = open (filename, 'rb')
+  except IsADirectoryError:
+    return # ignore dirs
+  for line in ofile:
     try:        string = line.decode ('utf-8')
     except:     string = None
     if string != None: yield string

diff --git a/misc/package.json.in b/misc/package.json.in
@@ -27,6 +27,7 @@
     "eslint-plugin-lit": "^1.8.3",
     "eslint-plugin-unused-imports": "^2.0.0",
     "eslint-plugin-vue": "^9.14.1",
+    "fork-awesome": "^1.2.0",
     "icon-gen": "^3.0.1",
     "jsdoc": "^4.0.2",
     "jsdoc-api": "^8.0.0",