Update fiddle.make to account for Makefile changes in [178b7d46f9].

FossilOrigin-Name: 7a5d810549f2686ae923fd0ca03ad8f536c9080b6879128ee8f00e653bb7f3f1

diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index 57141d7e2be05e971926438d86a865e82ab18015..496e518de66b0ebb159475e77979d92ddb98c6ea 100644 (file)
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -9,16 +9,18 @@ MAKEFILE.fiddle := $(lastword $(MAKEFILE_LIST))
 # shell.c and its build flags...
 make-np-0 := make -C  $(dir.top) -n -p
 make-np-1 := sed -e 's/(TOP)/(dir.top)/g'
+# Extract SHELL_OPT and SHELL_DEP from the top-most makefile and import
+# them as vars here...
 $(eval $(shell $(make-np-0) | grep -e '^SHELL_OPT ' | $(make-np-1)))
-$(eval $(shell $(make-np-0) | grep -e '^SHELL_SRC ' | $(make-np-1)))
+$(eval $(shell $(make-np-0) | grep -e '^SHELL_DEP ' | $(make-np-1)))
 # ^^^ can't do that in 1 invocation b/c newlines get stripped
 ifeq (,$(SHELL_OPT))
 $(error Could not parse SHELL_OPT from $(dir.top)/Makefile.)
 endif
-ifeq (,$(SHELL_SRC))
-$(error Could not parse SHELL_SRC from $(dir.top)/Makefile.)
+ifeq (,$(SHELL_DEP))
+$(error Could not parse SHELL_DEP from $(dir.top)/Makefile.)
 endif
-$(dir.top)/shell.c: $(SHELL_SRC) $(dir.top)/tool/mkshellc.tcl $(sqlite3.c)
+$(dir.top)/shell.c: $(SHELL_DEP) $(dir.top)/tool/mkshellc.tcl $(sqlite3.c)
        $(MAKE) -C $(dir.top) shell.c
 # /shell.c
 ########################################################################

diff --git a/manifest b/manifest
index 2e23e4d0aaa7510875a440fda525e9d150f1af07..5d51d24787be860c55a42b944a8f7a662f1500db 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C /fiddle:\sbefore\sresetting\sa\sdb,\sroll\sback\sany\stransactions\s(resolves\sproblem\sreported\sin\s[forum:0b41a25d65|forum\spost\s0b41a25d65])\sand\sremove\san\sobsolete/broken\sreference\sto\sa\slong-gone\sAPI\swhich\scould\scause\sinitialization\sto\sfail\sprematurely.
-D 2024-03-05T06:31:37.489
+C Update\sfiddle.make\sto\saccount\sfor\sMakefile\schanges\sin\s[178b7d46f9].
+D 2024-03-05T07:55:20.122
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -638,7 +638,7 @@ 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 fa2ba6e90457ba2a71cb745f200d409caf773076df75ae5b177cc225d7627a11
+F ext/wasm/fiddle.make 3c2eace29255d6ddd219f5d8cc2728cb28b9fe717ea80b6062c2a6178947a16b
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce
 F ext/wasm/fiddle/fiddle.js 974b995119ac443685d7d94d3b3c58c6a36540e9eb3fed7069d5653284071715
@@ -2176,8 +2176,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 178b7d46f9c8e1694ed6f506d2785a9f5c49e2b428e04c8096d557cc1b5c9680
-R 64eca58e8ac762a5eb6b341ff69c8405
+P ee164ca73cf4151b1a1bf351729afa9b0ec95bd5004a5d5bfce3ed46268bfbf3
+R 83071ca8acab359a5924e5d4cf357b67
 U stephan
-Z ff3bca729d13aff9e0b3d1adfb9ed46d
+Z 2b4d9c85414ada098b40af0814689ab8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c3a86e0b30ab84c856e14e00625f6acfa50d09e3..b6932ff82ea72ac49c339c2825f004ba98f2fde6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee164ca73cf4151b1a1bf351729afa9b0ec95bd5004a5d5bfce3ed46268bfbf3
\ No newline at end of file
+7a5d810549f2686ae923fd0ca03ad8f536c9080b6879128ee8f00e653bb7f3f1
\ No newline at end of file