wasm: accommodate moving generated sqlite3.js in the previous checkin.

FossilOrigin-Name: 41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42

diff --git a/ext/wasm/scratchpad-opfs-main.html b/ext/wasm/scratchpad-opfs-main.html
index 36ae55c14742394ad3de083d47bd1af0ed62f266..8edd15a671193576a313c150f82238362d26ddad 100644 (file)
--- a/ext/wasm/scratchpad-opfs-main.html
+++ b/ext/wasm/scratchpad-opfs-main.html
@@ -33,7 +33,7 @@
     <p>All stuff on this page happens in the dev console.</p>
     <hr>
     <div id='test-output'></div>
-    <script src="api/sqlite3.js"></script>
+    <script src="sqlite3.js"></script>
     <script src="common/SqliteTestUtil.js"></script>
     <script src="scratchpad-opfs-main.js"></script>
   </body>

diff --git a/ext/wasm/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker.js
index 5590a5a44aa4346e29318a6b1ccacdaa4021f1db..debd0245e012cbc2f21783d8557469227bffa4da 100644 (file)
--- a/ext/wasm/scratchpad-opfs-worker.js
+++ b/ext/wasm/scratchpad-opfs-worker.js
@@ -11,7 +11,7 @@
   ***********************************************************************
 
   A basic test script for sqlite3-api.js. This file must be run in
-  main JS thread and sqlite3.js must have been loaded before it.
+  main JS thread. It will load sqlite3.js in a worker thread.
 */
 'use strict';
 (function(){
@@ -19,8 +19,7 @@
   const log = console.log.bind(console),
         warn = console.warn.bind(console),
         error = console.error.bind(console);
-
-  const W = new Worker("api/scratchpad-opfs-worker.js");
+  const W = new Worker("scratchpad-opfs-worker2.js");
   self.onmessage = function(ev){
     ev = ev.data;
     const d = ev.data;

diff --git a/ext/wasm/api/scratchpad-opfs-worker.js b/ext/wasm/scratchpad-opfs-worker2.js
similarity index 96%
rename from ext/wasm/api/scratchpad-opfs-worker.js
rename to ext/wasm/scratchpad-opfs-worker2.js
index 5bc63c7966927174157c1d3be8f2e8ff065cb79e..2e7527adc72eec3c25b917f5af4e2c5d5473f23a 100644 (file)
--- a/ext/wasm/api/scratchpad-opfs-worker.js
+++ b/ext/wasm/scratchpad-opfs-worker2.js
@@ -34,7 +34,7 @@
   };
 
   const stdout = console.log.bind(console);
-  const stderr = function(...args){wMsg('stderr', args);};
+  const stderr = console.error.bind(console);//function(...args){wMsg('stderr', args);};
 
   const test1 = function(db){
     db.execMulti("create table if not exists t(a);")

diff --git a/manifest b/manifest
index 9f7ff290a01703b4dfe195ba5718e266d1134eb4..24170d04b4392daa4bafd8004606c1c675e1a13a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C wasm:\sdisable\sshared\scache\smode\sby\sdefault.\sExperimentally\smove\swasm-build\sgenerated\sfiles\sup\sone\sdir\sto\srule\sthe\sextra\sdir\sout\sas\sa\sproblem\sfor\sEmscripten-related\sworker-loading\sfailures.
-D 2022-08-16T16:06:12.337
+C wasm:\saccommodate\smoving\sgenerated\ssqlite3.js\sin\sthe\sprevious\scheckin.
+D 2022-08-16T16:11:20.050
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -481,7 +481,6 @@ F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de
 F ext/wasm/api/README.md b6d0fb64bfdf7bf9ce6938ea4104228f6f5bbef600f5d910b2f8c8694195988c
 F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba81456260a713ed04900c
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
-F ext/wasm/api/scratchpad-opfs-worker.js ccafcbc548f8ead91e5151c26ea7fb4ded705fd6b65c4557c6c2bcd6a8922d85
 F ext/wasm/api/sqlite3-api-cleanup.js 149fd63a0400cd1d69548887ffde2ed89c13283384a63c2e9fcfc695e38a9e11
 F ext/wasm/api/sqlite3-api-glue.js 82c09f49c69984009ba5af2b628e67cc26c5dd203d383cd3091d40dab4e6514b
 F ext/wasm/api/sqlite3-api-oo1.js a3469bbb217b9787ba9aa6216423ec55cf9457fecefb9698e433d0e1cc4cc918
@@ -503,10 +502,11 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 447cc02b598f7792edaa8ae6853a7847b8178a18ed356afacbdbf312b2588106
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/scratchpad-opfs-main.html 079b6ec0b3a6c35c9ac92e639ede1b253b901c52ec6a793e5411babb708ace40
+F ext/wasm/scratchpad-opfs-main.html 4565cf194e66188190d35f70e82553e2e2d72b9809b73c94ab67b8cfd14d2e0c
 F ext/wasm/scratchpad-opfs-main.js a819ed26047c5539630cea59add6a5082ba04cdf82da2df2e0707d4d69af6cb1
 F ext/wasm/scratchpad-opfs-worker.html 66c1d15d678f3bd306373d76b61c6c8aef988f61f4a8dd40185d452f9c6d2bf5
-F ext/wasm/scratchpad-opfs-worker.js c42a10db96e1c313175e2817766789aa4ce175c9574532e76082e69ba7d08f05
+F ext/wasm/scratchpad-opfs-worker.js 3ec2868c669713145c76eb5877c64a1b20741f741817b87c907a154b676283a9
+F ext/wasm/scratchpad-opfs-worker2.js de3ea77548243a638c8426b7e43cc1dbfc511013228ab98436eb102923ed6689 w ext/wasm/api/scratchpad-opfs-worker.js
 F ext/wasm/testing1.html 0bf3ff224628c1f1e3ed22a2dc1837c6c73722ad8c0ad9c8e6fb9e6047667231
 F ext/wasm/testing1.js a25069e20d5f8dc548cc98bcf7002cec812084421a1f7f70ffae2c706d1167b2
 F ext/wasm/testing2.html 73e5048e666fd6fb28b6e635677a9810e1e139c599ddcf28d687c982134b92b8
@@ -2004,8 +2004,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 6401595e59179c5c0f6e51c5362cf4391787e7a55b9c6ca655746e30d3251f2b
-R 658c31cfb5b14194f7082d626102688f
+P e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
+R 9311647d4bd948f09c1d1ad00326a894
 U stephan
-Z ece080cb3d48a7dbb6a6c937a212c0a6
+Z a8a2ceb6325a77f43310bbc5ef685064
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f1a6b33e5c05ab5af6421c4ba4c648ac97d3d57..f5359328132039888e0dd1e72e4c2b168611af74 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e38d00c2b82d7e51ec04cd739514f255edde679b8ddab31fa944b3517d45c3ea
\ No newline at end of file
+41762f9518bb51b8b23ae6507628d6d3256044e1f2aca6e7251dc57722062c42
\ No newline at end of file