merging main and dev branches

dktr0 · Feb 26, 2024 · 00ab265 · 00ab265
2 parents 0d1ffb5 + f8a5522
commit 00ab265
Show file tree

Hide file tree

Showing 8 changed files with 201,903 additions and 745,989 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+0.4.8.1:
+
+-bugfix affecting multiple layers of embedded arbitrary multichannel signals, eg. [[x,y],z]
+
 0.4.8:
 
 -added lines, linesp, ilines, ilinesp, chain, chainp, mesh and meshp. fixed further bugs affecting combinatorial geometrical transformations of shape functions

diff --git a/Makefile b/Makefile
@@ -38,11 +38,11 @@ clean:
 
 devBuild:
 	cabal --ghcjs --builddir=dev-result new-build all --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/x/punctual/build/punctual/punctual.jsexe/index.html .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/x/punctual/build/punctual/punctual.jsexe/rts.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/x/punctual/build/punctual/punctual.jsexe/lib.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/x/punctual/build/punctual/punctual.jsexe/out.js .
-	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/x/punctual/build/punctual/punctual.jsexe/runmain.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/x/punctual/build/punctual/punctual.jsexe/index.html .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/x/punctual/build/punctual/punctual.jsexe/rts.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/x/punctual/build/punctual/punctual.jsexe/lib.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/x/punctual/build/punctual/punctual.jsexe/out.js .
+	cp -f dev-result/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/x/punctual/build/punctual/punctual.jsexe/runmain.js .
 
 devTest:
 	cabal --ghcjs new-test test:tests --disable-library-profiling --disable-documentation
@@ -54,8 +54,8 @@ buildBenchmark:
 	cabal --ghcjs --builddir=benchmark new-build punctual-benchmarks --disable-library-profiling --disable-documentation --ghcjs-options=-DGHCJS_GC_INTERVAL=60000
 
 runBenchmark:
-	node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js
+	node benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/all.js
 
 runBenchmarkInBrowser:
-	open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html
+	open benchmark/build/x86_64-linux/ghcjs-8.6.0.1/punctual-0.4.8.1/b/punctual-benchmarks/build/punctual-benchmarks/punctual-benchmarks.jsexe/index.html