wasm snapshot and doc-related build automation tweaks.

FossilOrigin-Name: 13eb1abd06f55fb88fc7f7be6149fd94b12057d9c38cc6b97bec3940e7e01f04

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index d8ee9c758a72e4e43db62a1f2f98ecb9c908889a..d2d68daa5792e50cc650b435fe20ac0fa299e589 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -811,12 +811,6 @@ endif
 # /wasmfs
 ########################################################################
 
-########################################################################
-# Create main client downloadable zip file:
-ifneq (,$(filter dist snapshot,$(MAKECMDGOALS)))
-include dist.make
-endif
-
 ########################################################################
 # Push files to public wasm-testing.sqlite.org server
 wasm-testing.include = *.js *.mjs *.html \
@@ -839,27 +833,35 @@ push-testing:
 ########################################################################
 # If we find a copy of the sqlite.org/wasm docs checked out, copy
 # certain files over to it, noting that some need automatable edits...
-WDOCS.home ?= ../../../wdoc
+wasm.docs.home ?= ../../../wdoc
+wasm.docs.found = $(if $(wildcard $(wasm.docs.home)/api-index.md),\
+  $(wildcard $(wasm.docs.home)),)
 .PHONY: update-docs
-ifneq (,$(wildcard $(WDOCS.home)/api-index.md))
-WDOCS.jswasm := $(WDOCS.home)/jswasm
+ifeq (,$(wasm.docs.found))
+update-docs:
+       @echo "Cannot find wasm docs checkout."; \
+       echo "Pass wasm.docs.home=/path/to/wasm/docs/checkout or edit this makefile to suit."; \
+       exit 127
+else
+wasm.docs.jswasm := $(wasm.docs.home)/jswasm
 update-docs: $(bin.stripccomments) $(sqlite3.js) $(sqlite3.wasm)
        @echo "Copying files to the /wasm docs. Be sure to use an -Oz build for this!"
-       cp $(sqlite3.wasm) $(WDOCS.jswasm)/.
+       cp $(sqlite3.wasm) $(wasm.docs.jswasm)/.
        $(bin.stripccomments) -k -k < $(sqlite3.js) \
-               | sed -e '/^[ \t]*$$/d' > $(WDOCS.jswasm)/sqlite3.js
-       cp demo-123.js demo-123.html demo-123-worker.html $(WDOCS.home)
+               | sed -e '/^[ \t]*$$/d' > $(wasm.docs.jswasm)/sqlite3.js
+       cp demo-123.js demo-123.html demo-123-worker.html $(wasm.docs.home)
        sed -n -e '/EXTRACT_BEGIN/,/EXTRACT_END/p' \
-               module-symbols.html > $(WDOCS.home)/module-symbols.html
-else
-update-docs:
-       @echo "Cannot find wasm docs checkout."; \
-       echo "Pass WDOCS.home=/path/to/wasm/docs/checkout or edit this makefile to suit."; \
-       exit 127
+               module-symbols.html > $(wasm.docs.home)/module-symbols.html
 endif
 # end /wasm docs
 ########################################################################
 
+########################################################################
+# Create main client downloadable zip file:
+ifneq (,$(filter dist snapshot,$(MAKECMDGOALS)))
+include dist.make
+endif
+
 # Run local web server for the test/demo pages.
 httpd:
        althttpd -max-age 1 -enable-sab -page index.html

diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index c8b9ee1fb324604df3bce01f1fc22106e88b5a66..e4dbad7c995f3dd462259b7251a475ed021b68ec 100644 (file)
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -97,9 +97,17 @@ dist: \
                ls -la $$arczip; \
                set +e; \
                unzip -lv $$arczip || echo "Missing unzip app? Not fatal."
+ifeq (,$(wasm.docs.found))
 snapshot: dist
-       @echo "Upload snapshot with:"; \
-       echo "rsync -ve ssh $(dist-name-prefix)*.zip $(wasm-testing.dest)/snapshots/."
+       @echo "To upload the snapshot build to the wasm docs server:"; \
+       echo "1) move $(dist-name-prefix)*.zip to the top of a wasm docs checkout."; \
+  echo "2) run 'make uv-sync'"
+else
+snapshot: dist
+       @echo "Moving snapshot to [$(wasm.docs.found)]..."; \
+       mv $(dist-name-prefix)*.zip $(wasm.docs.found)/.
+       @echo "Run 'make uv-sync' from $(wasm.docs.found) to upload it."
+endif
 # We need a separate `clean` rule to account for weirdness in
 # a sub-make, where we get a copy of the $(dist-name) dir
 # copied into the new $(dist-name) dir.

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index 33a115d2e904c9c1695e43c27be9221f5c2bf003..a547ce50fa456952e38ba4a47eb4aeaa6c9267e2 100644 (file)
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -88,9 +88,9 @@
             <li><a href='speedtest1.html'>speedtest1</a>: a main-thread WASM build of speedtest1.</li>
             <!--li><a href='speedtest1-wasmfs.html?flags=--size,25'>speedtest1-wasmfs</a>: a variant of speedtest1 built solely for the wasmfs/opfs feature.
                 </li-->
-            <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1-kvvfs</a>: speedtest1 with the kvvfs.</li>
+            <li><a href='speedtest1.html?vfs=kvvfs'>speedtest1?vfs=kvvfs</a>: speedtest1 with the kvvfs.</li>
             <li><a href='speedtest1-worker.html?size=25'>speedtest1-worker</a>: an interactive Worker-thread variant of speedtest1.</li>
-            <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker-opfs</a>: speedtest1-worker with the
+            <li><a href='speedtest1-worker.html?vfs=opfs&size=25'>speedtest1-worker?vfs=opfs</a>: speedtest1-worker with the
               OPFS VFS preselected and configured for a moderate workload.</li>
           </ul>
         </li>

diff --git a/manifest b/manifest
index 809ca5f22ff3bbce7ccae3b3b16d4bc2e9127528..dd28e4d2802636f0068aed86991712a9721d8fa3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\soo1.DB's\sdistinct-per-VFS\spost-open()\sstep\sto\saccept\seither\sa\sbatch\sof\sSQL\sor\sa\scallback\sfunction.\sIncrease\sOPFS's\sbusy\stimeout\sto\s10s.
-D 2022-12-03T01:59:03.165
+C wasm\ssnapshot\sand\sdoc-related\sbuild\sautomation\stweaks.
+D 2022-12-03T02:42:21.560
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -491,7 +491,7 @@ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 54ab8da16a01e78bf5767c0e7bd57af07bfeb3a71fbecd63a39b3dbeec967c4e
+F ext/wasm/GNUmakefile 6f64170c1c69a19ec76bb7f61bb69a4c009a3c3a6907617264140f69264a5b85
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api b4d68c97d14944b48d55e06aa44f544a6f56a7fa2bcb6f9e030936a5b2a9479a
@@ -531,14 +531,14 @@ F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98
 F ext/wasm/demo-worker1-promiser.js b85a2bb1b918db4f09dfa24419241cb3edad7791389425c2505092e9b715017d
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js a619adffc98b75b66c633b00f747b856449a134a9a0357909287d80a182d70fa
-F ext/wasm/dist.make 994cc61822694b123d4357731072937a54153fbe5d9b12c6cb95d5562d2766dc
+F ext/wasm/dist.make 701694188a78c9a24bf44cdf529063f4b3a0e892adc1d20ed1619252738943f1
 F ext/wasm/fiddle.make 2812c44c9bafb5be9c8767963d1b9f374d77af7795fcaa06483c03e7059dea74
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html c806b6005145b71d64240606e9c6e0bf56878ee8829c66fe7486cebf34b0e6b1
-F ext/wasm/index.html 618ad5cbc07b55556a4e09931773761698a38323387d392046bda907f1ce4c52
+F ext/wasm/index.html f151b7c7b5cfdc066567d556acd168e769efd4e982286dc5f849a5ee69ecd0ff
 F ext/wasm/jaccwabyt/jaccwabyt.js 95f573de1826474c9605dda620ee622fcb1673ae74f191eb324c0853aa4dcb66
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/module-symbols.html b8eebafef8e536624bbe5f7a3da40c07a9062b843dfd3161a0bb72cbb6763dc5
@@ -2065,8 +2065,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 57dd593ef0efa17dfb3a9f4eac36d5b8b879e271de817d8cd94a8c8b56d31870
-R c08d64a2fd44c82ec1d52c0b8202d402
+P 9feefe253ac487cb52be6bdf91bdd305963266716baa08f2bf9505954ee76321
+R 595dc0b8e35ed0115509bba594a7e5c6
 U stephan
-Z 36a132ccc79fdf9c5e77fe15b521856c
+Z 192475a6131cf0ba0ca1840d5782ce18
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ec9f8c2463302c67ee65f9912dd15e667b83fd02..09075c1212d3b87485f80766317e423e3572657e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9feefe253ac487cb52be6bdf91bdd305963266716baa08f2bf9505954ee76321
\ No newline at end of file
+13eb1abd06f55fb88fc7f7be6149fd94b12057d9c38cc6b97bec3940e7e01f04
\ No newline at end of file