From: stephan <stephan@noemail.net>
Date: Thu, 13 Jul 2023 18:35:48 +0000 (+0000)
Subject: Reintroduce WASMFS+OPFS support, albeit as a separate (less portable) WASM build.
X-Git-Tag: version-3.43.0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4449dc0ba9e0188ed466e42878a52fb7576efe3;p=thirdparty%2Fsqlite.git

Reintroduce WASMFS+OPFS support, albeit as a separate (less portable) WASM build.

FossilOrigin-Name: 7e4c594e9591101f6b727212c99f561498444e86d3d059e5864a717c614f903a
---

f4449dc0ba9e0188ed466e42878a52fb7576efe3
diff --cc ext/wasm/GNUmakefile
index a99513bfa8,65b6294e64..2066c8f164
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@@ -906,8 -931,8 +931,9 @@@ $(speedtest1.js): $(MAKEFILE) $(speedte
          $(SQLITE_OPT) \
          -USQLITE_C -DSQLITE_C=$(sqlite3.canonical.c) \
          $(speedtest1.exit-runtime0) \
-         -o $@ $(speedtest1.cses) -lm
+         -o $@ $(speedtest1.cfiles) -lm
  	$(maybe-wasm-strip) $(speedtest1.wasm)
++	chmod -x $(speedtest1.wasm)
  	ls -la $@ $(speedtest1.wasm)
  
  speedtest1: $(speedtest1.js)
diff --cc ext/wasm/wasmfs.make
index 020014f3e8,b97f812750..3947cc51f9
--- a/ext/wasm/wasmfs.make
+++ b/ext/wasm/wasmfs.make
@@@ -117,16 -95,20 +95,21 @@@ $(speedtest1-wasmfs.mjs): $(speedtest1.
    $(EXPORTED_FUNCTIONS.speedtest1)
  	@echo "Building $@ ..."
  	$(emcc.bin) \
-          $(emcc.speedtest1.common) $(emcc.flags.speedtest1-wasmfs) \
-         $(pre-post-sqlite3-wasmfs.flags.vanilla) \
+         $(pre-post-sqlite3-wasmfs-esm.flags) \
+         $(cflags.common) \
          $(cflags.sqlite3-wasmfs) \
-         -o $@ $(speedtest1.cses) -lm
+         $(emcc.speedtest1.common) \
+         $(emcc.flags.speedtest1-vanilla) \
+         $(emcc.flags.sqlite3-wasmfs) \
+         $(emcc.flags.speedtest1-wasmfs) \
+         -o $@ $(speedtest1.cfiles) -lm
+ 	@$(call SQLITE3.xJS.ESM-EXPORT-DEFAULT,1)
  	$(maybe-wasm-strip) $(speedtest1-wasmfs.wasm)
++	chmod -x $(speedtest1-wasmfs.wasm)
  	ls -la $@ $(speedtest1-wasmfs.wasm)
  
- #speedtest1: $(speedtest1-wasmfs.js)
- wasmfs: $(speedtest1-wasmfs.js)
- CLEAN_FILES += $(speedtest1-wasmfs.js) $(speedtest1-wasmfs.wasm) \
-      $(subst .js,.worker.js,$(speedtest1-wasmfs.js))
+ wasmfs: $(speedtest1-wasmfs.mjs)
+ CLEAN_FILES += $(speedtest1-wasmfs.mjs) $(speedtest1-wasmfs.wasm) \
+      $(subst .js,.worker.js,$(speedtest1-wasmfs.mjs))
  # end speedtest1.js
  ########################################################################
diff --cc manifest
index 1724a15f2b,a28d0daae4..a92937e4b0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\san\soff-by-one\serror\sin\stests\sfor\scells\soverflowing\sthe\send\spages.\s\sThe\nerror\sis\scompletely\sharmless\sfor\sthe\sdefault\spage\scache,\sbut\smight\scause\nproblems\sfor\sapplication-defined\spage\scaches\sthat\spack\spages\stightly\ntogether.
- D 2023-07-13T14:49:39.099
 -C Minor\scleanups\srelated\sto\sreintroducing\swasmfs\ssupport.
 -D 2023-07-13T18:13:52.732
++C Reintroduce\sWASMFS+OPFS\ssupport,\salbeit\sas\sa\sseparate\s(less\sportable)\sWASM\sbuild.
++D 2023-07-13T18:35:48.455
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -482,7 -482,7 +482,7 @@@ F ext/userauth/sqlite3userauth.h 7f3ea8
  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 38700d5074af690f004e4e5f3533164ab49693b9d0832929c4ecf97a0bc09494
 -F ext/wasm/GNUmakefile fec1dd8ad46a35d817f273d470a4f062a58c2445bc9b7d022826fa578dbbeedb
++F ext/wasm/GNUmakefile e5973aedcdb82798fdf814a69bacc17212a4143ff519c023c92d36104aaf4ae5
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md ef39861aa21632fdbca0bdd469f78f0096f6449a720f3f39642594af503030e9
  F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-api d6a5078f48a5301ed17b9a30331075d9b2506e1360c1f0dee0c7816c10acd9ab
@@@ -534,9 -534,10 +534,10 @@@ F ext/wasm/index.html b768e8659b4fe3119
  F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
  F ext/wasm/jaccwabyt/jaccwabyt.md 37911f00db12cbcca73aa1ed72594430365f30aafae2fa9c886961de74e5e0eb
  F ext/wasm/module-symbols.html 841de62fc198988b8330e238c260e70ec93028b096e1a1234db31b187a899d10
- F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
- F ext/wasm/scratchpad-wasmfs-main.js 4c140457f4d6da9d646a49addd91edb6e9ad1643c6c48e3258b5bce24725dc18
- F ext/wasm/speedtest1-wasmfs.html 7a301f4f5b6ad4f5d37fd6e7ca03a2f5d5547fd289da60a39075a93d7646d354
 -F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 -F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
++F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 w ext/wasm/scratchpad-wasmfs-main.html
++F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 w ext/wasm/scratchpad-wasmfs-main.js
+ F ext/wasm/speedtest1-wasmfs.html dc930dd767ee95cecbfa82fe89b173b51fee41a9ed4dbe7652fb9508a5041cd6
+ F ext/wasm/speedtest1-wasmfs.mjs ac5cadbf4ffe69e9eaac8b45e8523f030521e02bb67d654c6eb5236d9c456cbe
  F ext/wasm/speedtest1-worker.html 97c2bf5f8534091ce718de05801090d5a80c3f13575996f095ba23638e1bdca0
  F ext/wasm/speedtest1-worker.js 13b57c4a41729678a1194014afec2bd5b94435dcfc8d1039dfa9a533ac819ee1
  F ext/wasm/speedtest1.html ff048b4a623aa192e83e143e48f1ce2a899846dd42c023fdedc8772b6e3f07da
@@@ -552,7 -553,7 +553,7 @@@ F ext/wasm/tests/opfs/concurrency/index
  F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
  F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
  F ext/wasm/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd72273503ae7d5
- F ext/wasm/wasmfs.make cf9a68162d92ca2bcb0b9528b244cb36d5cc2d84ccc9c2d398461927d6e75aea
 -F ext/wasm/wasmfs.make 889be53a3d0f6bb0d270e25c4fb29f679b8d764c7fe864217180e61537cb9ac0
++F ext/wasm/wasmfs.make 4562e01ae0f5d753afbef241354e9d772bbcea2b9bec9c12148385c50a06656a
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
@@@ -2042,8 -2043,8 +2043,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 53eeffc9b1ea8c3ee7d7cdcc220997ed893403e45b35d8ea10805ea3b0435587
- R f55f041ebafddabf4ddb162a1fc63377
- U drh
- Z 047638bedbf2babca9e4fd105a9bea6f
 -P 953b8557194e9451dcf9f3bb433eafb67961487325e6519e675e73fecf850bfb
 -R e700999789f18f991c3d17a908f4a853
++P ce6793e954f291b6f5c29175baf730ce217328de1f0601b8935daac62af5f448 6918a927b5ecd1df5916b70d52d8d5ce289869c3f323e577b7dfc7c939084400
++R d30a9daa35bcdde0e18bf21352198964
++T +closed 6918a927b5ecd1df5916b70d52d8d5ce289869c3f323e577b7dfc7c939084400 Closed\sby\sintegrate-merge.
+ U stephan
 -Z 805b3da82b8639af9684880add6c1ac3
++Z 299699e1e3b9d4e621427d8076548f64
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 4c41db31e5,fcbd90c359..430f5ab058
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ce6793e954f291b6f5c29175baf730ce217328de1f0601b8935daac62af5f448
 -6918a927b5ecd1df5916b70d52d8d5ce289869c3f323e577b7dfc7c939084400
++7e4c594e9591101f6b727212c99f561498444e86d3d059e5864a717c614f903a