Disable the C-style comment stripper in the JS dist build, as explained in [forum...

FossilOrigin-Name: 76ffc70f1308c4d925d6f507de843302c69186bb6f45e237afa72072fc12e8c3

diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index e820e066d4626cd4513689f0af97ce7b742e42fd..10c64e16d63a31baddcfcb6abba44db878c4302a 100644 (file)
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -97,6 +97,15 @@ STRIP_K2.js := $(sqlite3.js) $(sqlite3.mjs) \
 # Note that we require $(bin.version-info) in order to figure out the
 # dist file's name, so cannot (without a recursive make) have the
 # target name equal to the archive name.
+#
+# 2025-01-15: Emsdk 4.0.0 introduces, in its generated code, a regex
+# which contains the pattern /*. That, of course, confuses any C-style
+# comment-stripper which is not specifically JS-aware and smart enough
+# to know that it's in a regex or string literal. Because of that,
+# comment-stripping is currently disabled, which means the builds will
+# be significantly larger than before.
+apply_comment_stripper := false
+# ^^^ shell command true or false
 dist: \
     $(bin.stripccomments) $(bin.version-info) \
     $(dist.build) $(STRIP_K1.js) $(STRIP_K2.js) \
@@ -109,8 +118,8 @@ dist: \
        @cp -p README-dist.txt $(dist-dir.top)/README.txt
        @cp -p index-dist.html $(dist-dir.top)/index.html
        @cp -p $(dist.jswasm.extras) $(dist-dir.jswasm)
-       @$(foreach JS,$(STRIP_K1.js),$(call DIST_STRIP_COMMENTS,$(JS),-k))
-       @$(foreach JS,$(STRIP_K2.js),$(call DIST_STRIP_COMMENTS,$(JS),-k -k))
+       @if $(apply_comment_stripper); then $(foreach JS,$(STRIP_K1.js),$(call DIST_STRIP_COMMENTS,$(JS),-k)) fi
+       @if $(apply_comment_stripper); then $(foreach JS,$(STRIP_K2.js),$(call DIST_STRIP_COMMENTS,$(JS),-k -k)) fi
        @cp -p $(dist.common.extras) $(dist-dir.common)
        @set -e; \
                vnum=$$($(bin.version-info) --download-version); \

diff --git a/manifest b/manifest
index 809b43bc20c6921c2d0f7554ef16a716529562c6..fa7a914da102ad047c39e299bbe054b6a9d67559 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.48.0
-D 2025-01-14T11:05:00.186
+C Disable\sthe\sC-style\scomment\sstripper\sin\sthe\sJS\sdist\sbuild,\sas\sexplained\sin\s[forum:529c20d344|forum\spost\s529c20d344].
+D 2025-01-15T14:31:19.260
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -668,7 +668,7 @@ F ext/wasm/demo-worker1-promiser.c-pp.html 635cf90685805e21772a5f7a35d1ace80f98a
 F ext/wasm/demo-worker1-promiser.c-pp.js fcc628cb42fcfaf07d250477801de1e6deb1e319d003976612a0db8d76b9fccc
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js 836bece8615b17b1b572584f7b15912236a5947fe8c68b98d2737d7e287447ef
-F ext/wasm/dist.make 653e212c1e84aa3be168d62a10616ccea45ee9585b0192745d2706707a5248ce
+F ext/wasm/dist.make a5bed3b6e6d6a644e1cd416f18b799b956765333130f948d1065872a7f1ce199
 F ext/wasm/example_extra_init.c 2347cd69d19d839ef4e5e77b7855103a7fe3ef2af86f2e8c95839afd8b05862f
 F ext/wasm/fiddle.make d4969f0322a582c57a22ce3541f10a5b09a609d14eab32891f613f43b3c14d8b
 F ext/wasm/fiddle/fiddle-worker.js 850e66fce39b89d59e161d1abac43a181a4caa89ddeea162765d660277cd84ce
@@ -2205,11 +2205,15 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 315079b150b47e013e2cde4985bc39d24e0f6f6c6e60f9383fb8ea4ea897c67a
-R 0ed0cfcc7f2bc831da5d62a3490571ed
-T +sym-major-relase *
-T +sym-relase *
-T +sym-version-3.48.0 *
-U drh
-Z cc77aac977f98c5521d75f4212754ff8
+P d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010
+Q +a9475e7614f8e44252abf273d0e0522c247df12624e40108ce98ad4aaf320f2d
+R 9ee6b001d36128af324c049ee8c06d1f
+T *branch * branch-3.48
+T *sym-branch-3.48 *
+T -sym-major-release * Cancelled\sby\sbranch.
+T -sym-release * Cancelled\sby\sbranch.
+T -sym-trunk * Cancelled\sby\sbranch.
+T -sym-version-3.48.0 * Cancelled\sby\sbranch.
+U stephan
+Z e8c6d4540445110c093081eaced36ed2
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 582262f689b8468addb745dd24590f24a67f4da6..55277100403c34b19dfddf8e791a200e825cae75 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2fe6b05f38d9d7cd78c5d252e99ac59f1aea071d669830c1ffe4e8966e84010
+76ffc70f1308c4d925d6f507de843302c69186bb6f45e237afa72072fc12e8c3