From: stephan <stephan@noemail.net>
Date: Fri, 26 Sep 2025 19:41:07 +0000 (+0000)
Subject: Delay replacing the wasm file name strings until they're needed. Add target b-all... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=879066a0a2c57d95ca60a7a9a5fc9c0e208ad885;p=thirdparty%2Fsqlite.git

Delay replacing the wasm file name strings until they're needed. Add target b-all to run all known wasm builds.

FossilOrigin-Name: a4edaecc9b0b649df53a99e05d9abfbc5bdb40d45c7c6940a50b24fa30dca158
---

diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile
index 9b08e1c0c2..d0786ea46b 100644
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@ -1150,6 +1150,10 @@ $(dir.dout)/sqlite3-opfs-async-proxy.js: $(dir.api)/sqlite3-opfs-async-proxy.js
 # they're always copied when we need them.
 #
 $(foreach B,$(b.names),$(eval $(out.$(B).js): $(sqlite3.ext.js)))
+#
+# b-all: builds all available js/wasm builds.
+#
+$(foreach B,$(b.names),$(eval b-all: $(out.$(B).js)))
 
 #
 # speedtest1 is our primary benchmarking tool.
diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c
index 78b33be1c1..e360f869e5 100644
--- a/ext/wasm/mkwasmbuilds.c
+++ b/ext/wasm/mkwasmbuilds.c
@@ -740,11 +740,9 @@ static void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
      pB->zEmo, zBuildName, pB->flags);
   pf("# zCmppD=%s\n# zBaseName=%s\n",
      pB->zCmppD ? pB->zCmppD : "", zBaseName);
-
   pf("b.names += %s\n"
      "emo.b.%s = %s\n",
      zBuildName, zBuildName, pB->zEmo);
-
   emit_logtag(zBuildName);
 
   if( pB->zIfCond ){
@@ -848,12 +846,11 @@ static void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
       pf("\t@$(call b.do.wasm-opt,%s)\n", zBuildName);
       pf("\t@$(call b.strip-js-emcc-bindings,$(logtag.%s))\n", zBuildName);
       { /* Replace @sqlite3.wasm@ with the proper wasm file name. */
-        char const *zWF = pB->zDotWasm ? pB->zDotWasm : pB->zBaseName;
         pf("\t@echo '"
            "$(logtag.%s) $(emo.disk) s/@sqlite.wasm@/%s.wasm/g"
            "'; "
            "sed -i -e 's/@sqlite3.wasm@/%s.wasm/g' $@ || exit\n",
-           zBuildName, zWF, zWF);
+           zBuildName, pB->zBaseName, pB->zBaseName);
       }
 
       if( CP_JS & pB->flags ){
diff --git a/manifest b/manifest
index a435ff1fa9..59f5aa5575 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Consolidate\ssome\sduplicate\scode\sin\smkwasmbuilds.c.
-D 2025-09-26T19:30:34.150
+C Delay\sreplacing\sthe\swasm\sfile\sname\sstrings\suntil\sthey're\sneeded.\sAdd\starget\sb-all\sto\srun\sall\sknown\swasm\sbuilds.
+D 2025-09-26T19:41:07.340
 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 7764a91525b21be837173e3907f6d2d3b17afc2d86b2888f90f906ba4736e1c7
+F ext/wasm/GNUmakefile 47535171454c7448c116b4a51b7c820a90985d5c2484ca708afc36453d3385ba
 F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a
 F ext/wasm/README.md 66ace67ae98a45e4116f2ca5425b716887bcee4d64febee804ff6398e1ae9ec7
 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@ -634,7 +634,7 @@ F ext/wasm/index.html 1b06cef70db4b2d5c0af1f9e6e32b27c1ca298cde97365a887926d501f
 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 edf7f327730d242e02a6562b22d785c3d283876e978c7cd16bc99b1e18062027
+F ext/wasm/mkwasmbuilds.c d86a3e178c4b17d3a430fd9579de3eb4f6575514237f22a03f5b83b077f36ed2
 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
@@ -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 64715e92708e4f8c5b82c1f4ed71b75f418bf741f7f05516eab309582fbfad2b
-R 89185099a4a37fe520acc0d423d2e065
+P 1078aa4f1e5685d45e31eea622865ddd077f367f1cec90fc267e8ba50cbe2ee9
+R b65f3059fdd3f1d5877924b91516a2b0
 U stephan
-Z 81e474cb3fbbccb53fc554d9953b696c
+Z 4ba1230dbb68926ec3e296b074eb91b5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a7880efd8e..8e51ef7553 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1078aa4f1e5685d45e31eea622865ddd077f367f1cec90fc267e8ba50cbe2ee9
+a4edaecc9b0b649df53a99e05d9abfbc5bdb40d45c7c6940a50b24fa30dca158