From: stephan <stephan@noemail.net>
Date: Tue, 1 Aug 2023 16:38:08 +0000 (+0000)
Subject: Fix part 2 of 2 for /fiddle: a make deps problem which caused fiddle to load but... 
X-Git-Tag: version-3.43.0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=887f6e5082bdd8cc3247d38eebbfc3b813964db3;p=thirdparty%2Fsqlite.git

Fix part 2 of 2 for /fiddle: a make deps problem which caused fiddle to load but fail to run when sqlite3.c was missing.

FossilOrigin-Name: 6011bc26764760af750de68f1553f45382766dd2195633ae267bdb4f9ac75d0f
---

diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 3d1dc3f902..57141d7e2b 100644
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -18,7 +18,7 @@ endif
 ifeq (,$(SHELL_SRC))
 $(error Could not parse SHELL_SRC from $(dir.top)/Makefile.)
 endif
-$(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl
+$(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl $(sqlite3.c)
 	$(MAKE) -C $(dir.top) shell.c
 # /shell.c
 ########################################################################
diff --git a/ext/wasm/fiddle/fiddle-worker.js b/ext/wasm/fiddle/fiddle-worker.js
index e239cbf51e..67f61008fb 100644
--- a/ext/wasm/fiddle/fiddle-worker.js
+++ b/ext/wasm/fiddle/fiddle-worker.js
@@ -221,7 +221,7 @@
       f._();
     }
   };
-  
+
   self.onmessage = function f(ev){
     ev = ev.data;
     if(!f.cache){
@@ -371,12 +371,14 @@
   sqlite3InitModule(fiddleModule).then((_sqlite3)=>{
     sqlite3 = _sqlite3;
     console.warn("Installing sqlite3 module globally (in Worker)",
-                 "for use in the dev console.");
-    self.sqlite3 = sqlite3;
+                 "for use in the dev console.", sqlite3);
+    globalThis.sqlite3 = sqlite3;
     const dbVfs = sqlite3.wasm.xWrap('fiddle_db_vfs', "*", ['string']);
     fiddleModule.fsUnlink = (fn)=>{
       return sqlite3.wasm.sqlite3_wasm_vfs_unlink(dbVfs(0), fn);
     };
     wMsg('fiddle-ready');
-  })/*then()*/;
+  }).catch(e=>{
+    console.error("Fiddle worker init failed:",e);
+  });
 })();
diff --git a/manifest b/manifest
index 1c02ae762e..a584b06049 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\spart\s1\sof\s2\sfor\s/fiddle\snot\srunning:\sbuild\sflags\swhich\swere\srenamed\sduring\srefactoring.
-D 2023-08-01T16:17:00.592
+C Fix\spart\s2\sof\s2\sfor\s/fiddle:\sa\smake\sdeps\sproblem\swhich\scaused\sfiddle\sto\sload\sbut\sfail\sto\srun\swhen\ssqlite3.c\swas\smissing.
+D 2023-08-01T16:38:08.727
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -530,9 +530,9 @@ F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2
 F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef
 F ext/wasm/dist.make 3a851858aad72e246a5d9c5aaf6b6a144305f1bf898ac1846760ea7bab95c9a3
 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f
-F ext/wasm/fiddle.make 5059caa2683dda83448739b8e8f9f45330891d92a71f7708bde191ff8e0d1080
+F ext/wasm/fiddle.make fa2ba6e90457ba2a71cb745f200d409caf773076df75ae5b177cc225d7627a11
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
-F ext/wasm/fiddle/fiddle-worker.js 163d6139a93fab4bcb72064923df050d4e7c0ff0d8aa061ce8776a6e75da8a10
+F ext/wasm/fiddle/fiddle-worker.js e0153f9af6500805c6f09c0b3cfdb7d857e9d6863dbee9d50d1628fccf5f4b4d
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
 F ext/wasm/fiddle/index.html 5daf54e8f3d7777cbb1ca4f93affe28858dbfff25841cb4ab81d694efed28ec2
 F ext/wasm/index-dist.html 22379774f0ad4edcaaa8cf9c674c82e794cc557719a8addabed74eb8069d412e
@@ -2049,8 +2049,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 aa55c83f35c2ab134e0842201e46e021079283f9c65595c86664060b3aa8d715
-R cbb563045e455ed54ad88e12db1f1317
+P 214ffeeff77997c3352d30aaa6e51e2dea9706f0d08f73f4eacfad1864817fc6
+R 4ba1ff676b6006e1704f830ea492d45b
 U stephan
-Z 0d460b3d2880bf539ea1069e23b0bd35
+Z 769ce58cc540e5f5221900364e87c633
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ff611ade6c..574f2d0a07 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-214ffeeff77997c3352d30aaa6e51e2dea9706f0d08f73f4eacfad1864817fc6
\ No newline at end of file
+6011bc26764760af750de68f1553f45382766dd2195633ae267bdb4f9ac75d0f
\ No newline at end of file