Minor cleanups in the new fiddle build code.

FossilOrigin-Name: d356aebdd450bedc1ecbbdd266effe53c7badbd74ed7e6db8d0c31318d99a35f

diff --git a/ext/wasm/fiddle.make b/ext/wasm/fiddle.make
index c23a79fe0108affaf4d96410680965a11dc0513b..396e4dbedc10adea7d8c4c5d8097ef3b0b6fdbe9 100644 (file)
--- a/ext/wasm/fiddle.make
+++ b/ext/wasm/fiddle.make
@@ -72,12 +72,6 @@ fiddle-module.js$(2) := $(1)/fiddle-module.js
 fiddle-module.wasm$(2) := $$(subst .js,.wasm,$$(fiddle-module.js$(2)))
 $(1):
        @test -d "$$@" || mkdir -p "$$@"
-       @if [[ x.debug = x$(2) ]]; then \
-               cp -p $$(dir.fiddle)/index.html \
-                       $$(dir.fiddle)/fiddle.js \
-                       $$(dir.fiddle)/fiddle-worker.js \
-                       $$@/.; \
-       fi
 $$(fiddle-module.js$(2)): $(1) $$(MAKEFILE) $$(MAKEFILE.fiddle) \
     $$(EXPORTED_FUNCTIONS.fiddle) \
     $$(fiddle.cses) $$(pre-post-fiddle-module-vanilla.deps) $$(fiddle.SOAP.js$(2))
@@ -85,10 +79,17 @@ $$(fiddle-module.js$(2)): $(1) $$(MAKEFILE) $$(MAKEFILE.fiddle) \
     $$(pre-post-fiddle-module-vanilla.flags) \
     $$(fiddle.cses)
        $$(maybe-wasm-strip) $$(fiddle-module.wasm$(2))
-       cp -p $$(SOAP.js) $$(dir $$@)
-       gzip < $$@ > $$@.gz
-       gzip < $$(fiddle-module.wasm$(2)) > $$(fiddle-module.wasm$(2)).gz
-       gzip < $(1)/fiddle.js > $(1)/fiddle.js.gz
+       @cp -p $$(SOAP.js) $$(dir $$@)
+       @if [[ x.debug = x$(2) ]]; then \
+               cp -p $$(dir.fiddle)/index.html \
+                       $$(dir.fiddle)/fiddle.js \
+                       $$(dir.fiddle)/fiddle-worker.js \
+                       $$(dir $$@)/.; \
+       fi
+       @for i in $(1)/*.*js $(1)/*.html $(1)/*.wasm; do \
+               test -f $$$${i} || continue; \
+               gzip < $$$${i} > $$$${i}.gz; \
+       done
 fiddle$(2): $$(fiddle-module.js$(2)) $(1)/fiddle.js.gz
 endef
 

diff --git a/manifest b/manifest
index 3cbdf663f198d4ff3b57248dc31f05df2e45ee1f..1f1d75d54f0e23cf8892f80716936f787cdb55cc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\sfiddle\sbuild\sto\sbuild\sseparate\sdebug\sand\snon-debug\sbundles,\swith\sthe\slatter\sin\s./fiddle-debug.
-D 2024-06-18T21:50:30.081
+C Minor\scleanups\sin\sthe\snew\sfiddle\sbuild\scode.
+D 2024-06-18T22:03:28.064
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -643,7 +643,7 @@ F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2
 F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef
 F ext/wasm/dist.make 653e212c1e84aa3be168d62a10616ccea45ee9585b0192745d2706707a5248ce
 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f
-F ext/wasm/fiddle.make a0428f0b124e21e1d2a1203dfdccf5b24de084e8a60ad2dfdf01a68ebea877b7
+F ext/wasm/fiddle.make 86b8fcb1b1ff582a98e5913c84fa2ca39f0ad9e62bff019ab503dfad63874b98
 F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce
 F ext/wasm/fiddle/fiddle.js b444a5646a9aac9f3fc06c53d78af5e1912eb235d69a8e6010723e4eb0e9d4a1
 F ext/wasm/fiddle/index.html 739e0b75bc592679665d25e2f7649d2b8b2db678f3b41a772a8720b609b8482d
@@ -2194,8 +2194,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 66085ca42388e8de741712150541a3e0afb06b3e23e738aa9ff687e9fc494c50
-R 2f95eba5ca33d5fa3d5622563a8162c0
+P a9f1758f1cbe7b7d0c87dfb060f52d03c6ea0e066c079891a8ff354073997f9e
+R f25de9701b74b5cd8f8845c6dfa8833e
 U stephan
-Z 0e4370bc081e0a8227520f51d6156dfb
+Z 8c7f0a1de8acc9ed8f46178ab3ee4afe
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 1e48be88fdc4e42143515eb7eb8da0a0b46b2f79..49b16b1cd3c0fe09baacdde34964c7c623b872e4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9f1758f1cbe7b7d0c87dfb060f52d03c6ea0e066c079891a8ff354073997f9e
\ No newline at end of file
+d356aebdd450bedc1ecbbdd266effe53c7badbd74ed7e6db8d0c31318d99a35f
\ No newline at end of file