Remove the long-defunct wasmfs build of speedtest1 from index.html and re-enable...

FossilOrigin-Name: acaaf8cce9e780bf937436b4c987ed284aa0bba6f5ca9508d9dbad598af2991d

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 927481268f533405ee63335327cf851db8b90ada..fa1db22fdd52edfe92e26436268bb0d2df87dbf9 100644 (file)
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -1021,7 +1021,7 @@ fiddle.c.in = $(dir.top)/shell.c $(sqlite3-wasm.c)
 #
 # Only add wasmfs if wasmfs.enable=1 or we're running (dist)clean
 #
-ifneq (,$(filter wasmfs b-wasmfs,$(MAKECMDGOALS)))
+ifneq (,$(filter wasmfs b-wasmfs for-testing,$(MAKECMDGOALS)))
 wasmfs.enable ?= 1
 else
 # Unconditionally enable wasmfs for [dist]clean so that the wasmfs
@@ -1390,7 +1390,8 @@ for-testing.deps = \
   b-vanilla b-vanilla64 \
   b-esm b-esm64 \
   b-fiddle b-fiddle.debug \
-  b-speedtest1 b-speedtest164
+  b-speedtest1 b-speedtest164 \
+  b-wasmfs
 for-testing: $(for-testing.deps)
 
 ########################################################################

diff --git a/ext/wasm/api/pre-js.c-pp.js b/ext/wasm/api/pre-js.c-pp.js
index 9cebda4c0826800c5764908067b51111544ab71b..8a4a0f9fd0c2be594450b3ffcaa01102cdad3888 100644 (file)
--- a/ext/wasm/api/pre-js.c-pp.js
+++ b/ext/wasm/api/pre-js.c-pp.js
@@ -73,7 +73,7 @@
   }.bind(sIMS);
 
 //#if Module.instantiateWasm
-//#ifnot wasmfs
+//#if not wasmfs
   /**
      Override Module.instantiateWasm().
 
@@ -109,7 +109,7 @@
           .then(finalThen)
     return loadWasm();
   }.bind(sIMS);
-//#endif ifnot wasmfs
+//#endif not wasmfs
 //#endif Module.instantiateWasm
 })(Module);
 /* END FILE: api/pre-js.js. */

diff --git a/ext/wasm/index.html b/ext/wasm/index.html
index e72e8afac44ab89fd8a6ac101965c050ed1b38b1..55e4cdb75cc9b32653ef9ffd1e62722ef39cf255 100644 (file)
--- a/ext/wasm/index.html
+++ b/ext/wasm/index.html
@@ -153,13 +153,16 @@
           the WASMFS build is available on this server (it is not by
           default) and that this server emits the COOP/COEP headers.
           <ul>
-            <!--li><a href='scratchpad-wasmfs.html'>scratchpad-wasmfs</a>:
+            <li><a href='scratchpad-wasmfs.html'>scratchpad-wasmfs</a>:
               experimenting with WASMFS/OPFS-based persistence.
-            </li-->
-            <li><a href='speedtest1-wasmfs.html?flags=--size,10'>speedtest1-wasmfs</a>:
+            </li>
+            <!--speedtest1-wasmfs's build was broken in refactoring and it
+                has not been used in years, but it may be interesting
+                to revisit someday
+                li><a href='speedtest1-wasmfs.html?flags=--size,10'>speedtest1-wasmfs</a>:
               a variant of speedtest1 built solely for the wasmfs/opfs
               feature.
-            </li>
+            </li-->
           </ul>
         </li>
         <!--li><a href='x.html'></a></li-->

diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c
index 39cebfdc1a8bf1fce9cdc00dbaf2aa04abc28702..0d4f0b515f77138336d0dd45e8d1dbe4b2d0b306 100644 (file)
--- a/ext/wasm/mkwasmbuilds.c
+++ b/ext/wasm/mkwasmbuilds.c
@@ -404,13 +404,14 @@ const BuildDefs oBuildDefs = {
     .zEmo        = "💿",
     .zBaseName   = "sqlite3-wasmfs",
     .zDotWasm    = 0,
-    .zCmppD      = "$(c-pp.D.bundler)",
+    .zCmppD      = "$(c-pp.D.bundler) -Dwasmfs",
     .zEmcc       = 0,
     .zEmccExtra  =
     "-sEXPORT_ES6 -sUSE_ES6_IMPORT_META"
     " -sUSE_CLOSURE_COMPILER=0"
     " -pthread -sWASMFS -sPTHREAD_POOL_SIZE=1"
     " -sERROR_ON_UNDEFINED_SYMBOLS=0 -sLLD_REPORT_UNDEFINED"
+    " -DSQLITE_ENABLE_WASMFS"
     ,
     .zEnv        = 0,
     .zDeps       = 0,

diff --git a/ext/wasm/speedtest1-wasmfs.mjs b/ext/wasm/speedtest1-wasmfs.mjs
index aeb37dd7f933aa4d58ee316e5ada3485442386d0..0e468066784fd89464e79cef4e9b96c432880571 100644 (file)
--- a/ext/wasm/speedtest1-wasmfs.mjs
+++ b/ext/wasm/speedtest1-wasmfs.mjs
@@ -1,4 +1,4 @@
-import sqlite3InitModule from './jswasm/speedtest1-wasmfs.mjs';
+import sqlite3InitModule from './jswasm/sqlite3-wasmfs.mjs';
 const wMsg = (type,...args)=>{
   postMessage({type, args});
 };

diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index e3a151a8e6ca6af81cd20c5b141b6a04180501de..c0a7a7fa25ac6585e87e3bd88037d1798e76ef28 100644 (file)
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -3817,7 +3817,11 @@ globalThis.sqlite3InitModule = sqlite3InitModule;
       are simply lost, and such scripts see the globalThis.location of
       _this_ script.
     */
-    let sqlite3Js = '@sqlite3.js@'.split('/').pop()/*build-injected name has a path part*/;
+    let sqlite3Js = '@sqlite3.js@'
+        .split('/').pop()/*the build-injected name has a dir part and
+                           we specifically want to test the following
+                           support for locating the wasm, so remove
+                           that dir part. */;
     const urlParams = new URL(globalThis.location.href).searchParams;
     if(urlParams.has('sqlite3.dir')){
       sqlite3Js = urlParams.get('sqlite3.dir') + '/' + sqlite3Js;

diff --git a/manifest b/manifest
index ee755f371f253edb1557765415b0e32c19aa0803..981a5d54a44e316c1d5c5fbde1f4f4f3979491e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\snew\sc-pp\sfeatures\sto\ssimplify\sgeneration\sof\sthe\stester1\sfamily\sof\sfiles.
-D 2025-09-28T12:47:09.995
+C Remove\sthe\slong-defunct\swasmfs\sbuild\sof\sspeedtest1\sfrom\sindex.html\sand\sre-enable\sthe\swasmfs\sscratchpad\sapp\s(which\sstill\sworks).\sFix\sthe\sCFLAGS\sfor\sthe\swasmfs\sbuild\sand\sthe\spath\sto\sthe\swasm\sfile\sfor\sone\sof\sthe\sJS.
+D 2025-09-28T18:03:29.667
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -578,7 +578,7 @@ F ext/session/sqlite3session.c b3de195ce668cace9b324599bf6255a70290cbfb5451e826e
 F ext/session/sqlite3session.h 7404723606074fcb2afdc6b72c206072cdb2b7d8ba097ca1559174a80bc26f7a
 F ext/session/test_session.c 8766b5973a6323934cb51248f621c3dc87ad2a98f023c3cc280d79e7d78d36fb
 F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
-F ext/wasm/GNUmakefile 41f3a91a48816a9825e4e42bbbd449f16d68c4e1ca1dcf4c8827497a743ec4e2
+F ext/wasm/GNUmakefile c532444c786b2b5fadb6482b328a193ee93db0e2040e6bbeddf3780b1626d64d
 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
 F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@ -595,7 +595,7 @@ F ext/wasm/api/extern-post-js.c-pp.js eaa41ddccf70c3bb3b953e4edd1c0cb82e695166d8
 F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e7a4d11d43c5c8f41
 F ext/wasm/api/post-js-footer.js 5bd7170b5e8ce7b62102702bbcf47ef7b3b49cd56ed40c043fd990aa715b74ee
 F ext/wasm/api/post-js-header.js 79d078aec33d93b640a19c574b504d88bb2446432f38e2fbb3bb8e36da436e70
-F ext/wasm/api/pre-js.c-pp.js c53ece7660afcc8db7f697428dccac6a6b48ef20c43b430561e7e7f843e9a0b9
+F ext/wasm/api/pre-js.c-pp.js a876c6399dff29b6fe9e434036beb89889164cc872334e184291723ecc7cb072
 F ext/wasm/api/sqlite3-api-cleanup.js a3d6b9e449aefbb8bba283c2ba9477e2333a0eeb94a7a26b5bf952736f65a6dd
 F ext/wasm/api/sqlite3-api-glue.c-pp.js 12f5b36775fab1e7bf5385689fded2b2a9f77360562515e9849acb5e66602e2d
 F ext/wasm/api/sqlite3-api-oo1.c-pp.js db4c8ebb03bac60db32ce03f8c615b00f4e4ad53e7d5de5e63d2780cba052caa
@@ -630,16 +630,16 @@ F ext/wasm/fiddle/fiddle-worker.js 7798af02e672e088ff192716f80626c8895e19301a65b
 F ext/wasm/fiddle/fiddle.js 84fd75967e0af8b69d3dd849818342227d0f81d13db92e0dcbc63649b31a4893
 F ext/wasm/fiddle/index.html a27b8127ef9ecf19612da93b2a6a73bdb3777b5c56b5450bb7200a94bc108ff9
 F ext/wasm/index-dist.html db23748044e286773f2768eec287669501703b5d5f72755e8db73607dc54d290
-F ext/wasm/index.html 1b06cef70db4b2d5c0af1f9e6e32b27c1ca298cde97365a887926d501fb00b38
+F ext/wasm/index.html 54e27db740695ab2cb296e02d42c4c66b3f11b65797340d19fa6590f5b287da1
 F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d
 F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f
 F ext/wasm/mkdist.sh 29f8a37a7aba41fa5df8e89b1fab02b83b35c43473c5cf808584872e022514b8 x
-F ext/wasm/mkwasmbuilds.c 9d79591ec644f14c6fb06a9cb52f723dbce4d15583058af8bcc87609ee6020d1
+F ext/wasm/mkwasmbuilds.c 2640139178e0961d7933842e637ed6c21cde9506f59fa86194feb9c1877ce19d
 F ext/wasm/module-symbols.html e54f42112e0aac2a31f850ab33e7f2630a2ea4f63496f484a12469a2501e07e2
 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
 F ext/wasm/speedtest1-wasmfs.html 0e9d335a9b5b5fafe6e1bc8dc0f0ca7e22e6eb916682a2d7c36218bb7d67379d
-F ext/wasm/speedtest1-wasmfs.mjs c77c7231338ed5c0e1ce16aa29106df8e5b5cf11a48319c49433490a8d3ded30
+F ext/wasm/speedtest1-wasmfs.mjs 60dd5842f6d2a70a6d0bef12633a11491bde6984aff75a37c2040980d8cbf36a
 F ext/wasm/speedtest1-worker.html 068d4190f304fa1c34e6501a1b3a4c32fe8d8dac93c2d0f53d667a1cb386eedc
 F ext/wasm/speedtest1-worker.js 958a2d3c710bf8e82567277f656193a0248216db99a3c2c86966124b84309efb
 F ext/wasm/speedtest1.html c90d63dfa795f0cb1ad188de587be9024b1ff73b4adc5fdf7efc0d781be94d03
@@ -650,7 +650,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c
 F ext/wasm/tester1-worker.c-pp.html 883881eeac14eeeecc8ff22acf9fe0f18a97cacb48be08ebb0bae891ceded584
 F ext/wasm/tester1.c-pp.html 949920126dcf477925d8d540093d9cc374d3ab4c4ddee920c1dcadcf37917306
-F ext/wasm/tester1.c-pp.js 762682ad29de847aa353adac7f47e8615941b2afc50550fa8c90c14551bc4746
+F ext/wasm/tester1.c-pp.js 23fc1223e75228f054148eeb8469ad114e9b2881b9f437fa291b8da06d021ce3
 F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e
 F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65ad09f510589c779b7cc6a803a88
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1f6deabfff2fc2fed5fbff48d2637b48245e5a946a442c4bcc9b9ecb7c4848b9
-R 61ab22384b67899649f53dae2a4d1679
+P f7cab028c97b2c9ac9b561a4c33475aadd3f71cbd48ec4dd6e09c1bb19ec00cb
+R 111bf66cecc5d4d8dbf7a19268f337ee
 U stephan
-Z 8b6f19bade66e7c98d4e04557c2db4bb
+Z 6cfd7d970babb3978d704fe1297979dc
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index cbeababddf95c68c83b8467e5e68c34eb8adb052..49bda85fb9fceab9a040815598ddc6d9c149e91b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7cab028c97b2c9ac9b561a4c33475aadd3f71cbd48ec4dd6e09c1bb19ec00cb
+acaaf8cce9e780bf937436b4c987ed284aa0bba6f5ca9508d9dbad598af2991d