Expand and document the wasm doc-update make rules. Extend the dist rules to fail...

FossilOrigin-Name: 362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index dafe430de0f99c806e96e3a43e70e75691843b46..5316181208e3e6e5ba5da88ffb72245d3b91b248 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -580,24 +580,35 @@ wasm-testing.exclude = sql/speedtest1.sql
 wasm-testing.dir     = /jail/sites/wasm-testing
 wasm-testing.dest   ?= wasm-testing:$(wasm-testing.dir)
 # ---------------------^^^^^^^^^^^^ ssh alias
-push:
+.PHONY: push-testing
+push-testing:
        rsync -z -e ssh --ignore-times --chown=stephan:www-data --group -r \
     $(patsubst %,--exclude=%,$(wasm-testing.exclude)) \
     $(wasm-testing.include) $(wasm-testing.dest)
-       ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
-    echo "SSH failed: it's likely that stale content will be served via old gzip files." 
+       @echo "Updating gzipped copies..."; \
+               ssh wasm-testing 'cd $(wasm-testing.dir) && bash .gzip' || \
+    echo "SSH failed: it's likely that stale content will be served via old gzip files."
 
-WDOCS.home := $(wildcard ../../../wdoc)
-ifneq (,$(WDOCS.home))
-WDOCS.jswasm += $(WDOCS.home)/jswasm
-update-docs:
+########################################################################
+# 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
+.PHONY: update-docs
+ifneq (,$(wildcard $(WDOCS.home)/api-index.md))
+WDOCS.jswasm := $(WDOCS.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)/.
-       $(bin.stripccomments) -k -k < $(sqlite3.js) > $(WDOCS.jswasm)/sqlite3.js
+       $(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 -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 "Cannot find wasm docs checkout."; \
+       echo "Pass WDOCS.home=/path/to/wasm/docs/checkout or edit this makefile to suit."; \
+       exit 127
 endif
+# end /wasm docs
+########################################################################

diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index 13e750dbc5bdb8c9ed1ed315d0ab5301e54f51f6..5aee8af779d2034b2b93b52b4266501208e7e19d 100644 (file)
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -79,7 +79,8 @@ dist: \
        @$(bin.stripccomments) -k -k < $(sqlite3.js) \
                > $(dist-dir.jswasm)/$(notdir $(sqlite3.js))
        @cp -p $(dist.common.extras) $(dist-dir.common)
-       @vnum=$$($(bin.version-info) --download-version); \
+       @set -e; \
+               vnum=$$($(bin.version-info) --download-version); \
                vdir=sqlite-wasm-$$vnum; \
                arczip=$$vdir.zip; \
                echo "Making $$arczip ..."; \
@@ -88,6 +89,7 @@ dist: \
                zip -qr $$arczip $$vdir; \
                rm -fr $$vdir; \
                ls -la $$arczip; \
+               set +e; \
                unzip -lv $$arczip || echo "Missing unzip app? Not fatal."
 
 # We need a separate `clean` rule to account for weirdness in

diff --git a/ext/wasm/module-symbols.html b/ext/wasm/module-symbols.html
index 450abb932744bc508145a5f86929ca495a2ba47e..f2170031e446f9d3f47af0a82409e19449da30fd 100644 (file)
--- a/ext/wasm/module-symbols.html
+++ b/ext/wasm/module-symbols.html
@@ -93,7 +93,7 @@
       <li><a href='#sqlite3-namespace'><code>sqlite3</code> namespace</a></li>
       <li><a href='#sqlite3-version'><code>sqlite3.version</code> object</a></li>
       <li><a href='#sqlite3-functions'><code>sqlite3_...()</code> functions</a></li>
-      <li><a href='#sqlite3-constants'><code>SQLITE_...</code> functions</a></li>
+      <li><a href='#sqlite3-constants'><code>SQLITE_...</code> constants</a></li>
       <li><a href='#sqlite3.oo1'><code>sqlite3.oo1</code></a>
         <!--ul>
           <li><a href='#sqlite3.oo1.DB'><code>sqlite3.oo1.DB</code></a></li>

diff --git a/manifest b/manifest
index ee0e2baed748895e6d5281346502d4aa857f0830..46221cc4b79e593308763b36cbd612b56404115e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\ssqlite3.capi.wasm\snamespace\sto\ssqlite3.wasm.\sThis\scauses\sa\stiny\sbit\sof\snaming\sconfusion\swith\sthe\ssqlite3.wasm\s*file*,\sbut\sseems\sto\smake\smore\ssense\sthan\shaving\sit\sas\sa\ssub-namespace\sof\scapi.
-D 2022-10-29T07:54:10.497
+C Expand\sand\sdocument\sthe\swasm\sdoc-update\smake\srules.\sExtend\sthe\sdist\srules\sto\sfail\smore\sreadily\sif\sthere's\sa\sproblem.
+D 2022-10-29T09:45:01.066
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -487,7 +487,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 10fabfc07b7eba712dee566de7e62569b020ab11a4dfa5e9bea205fc28f47516
+F ext/wasm/GNUmakefile 94b55d2dea0eb16f82a2691bceeed265273c7fbb61a6063abfbc1efdf70aeb9c
 F ext/wasm/README-dist.txt 2d670b426fc7c613b90a7d2f2b05b433088fe65181abead970980f0a4a75ea20
 F ext/wasm/README.md 1e5b28158b74ab3ffc9d54fcbc020f0bbeb82c2ff8bbd904214c86c70e8a3066
 F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api 9120c2f8f51fa85f46dcf4dcb6b12f4a807d428f6089b99cdb08d8ddfcfd88b2
@@ -525,7 +525,7 @@ F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98
 F ext/wasm/demo-worker1-promiser.js f68ffbbe1c6086e18ce7961b8fc2b40dd88db174f59052e228c06b07484945ca
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 8ba51d94c4601fa5c313d9e59b63b238f5305b5d5739ad21f4782a0161e6682e
-F ext/wasm/dist.make b687dc07db2dc9669369f126ac42c4ff6539dce2531063a0e75405c74a3cee1d
+F ext/wasm/dist.make 481289899a07958439d07ee4302ff86235fa0fbb72f17ea05db2be90a94abf90
 F ext/wasm/fiddle.make 68abe5dcfdd6fdf8dc1b715b94b96fae771b5b28bc1843997b9b1ec79407f2c9
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
@@ -535,7 +535,7 @@ F ext/wasm/index-dist.html cb0da16cba0f21cda2c25724c5869102d48eb0af04446acd3cd0c
 F ext/wasm/index.html ce6a68a75532b47e3c0adb83381a06d15de8c0ac0331fb7bf31d33f8e7c77dc4
 F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab264dab6c285e6dbbd215
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
-F ext/wasm/module-symbols.html 25f6d585ef1d5034447701f18e972c2f3b98785250c9036cef93a4e36648d178
+F ext/wasm/module-symbols.html c473958c921adc4877ccaad94dafb506e807aced1949090180aa31cb29f1b9fc
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2054,8 +2054,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 2f53612388507f9b1ecbec3c15281825beab54b8062d97d0ab6f009c5fed347b
-R d0f4845aee84bee01e10da61e480927d
+P 3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
+R 9d0a0a43f67e35a7a9fafd5def96ccb8
 U stephan
-Z c420db9475e5b45210b3c19ba7dfb33a
+Z 6030ea3dadf7300cfa17e8c84bb8145d
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 61151e848439fdaa68d96ae2d824f8eafd545a65..6978e03c11c6a421341b02a049a388ac53a0fa8b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f16eb18d6186ca972fca952ccac18649e7a905213f589e53c0c9333e695448d
\ No newline at end of file
+362ec11ec09f441b745cbd8ac8366b6bc998aba6e2b70782a88f189a3ffa9923
\ No newline at end of file