Add 'snapshot' target to create distinctly-named snapshot builds of the wasm delivera...

FossilOrigin-Name: f7620aa09e4893971e00cdee5c6f1fe15c3bd21f985bec90fbd90fdfc457ac31

diff --git a/ext/wasm/dist.make b/ext/wasm/dist.make
index f33711a19deef1c7004df031b43a40ab74875808..b64663c105211d65fead4625f157a4b3e8a8c564 100644 (file)
--- a/ext/wasm/dist.make
+++ b/ext/wasm/dist.make
@@ -10,31 +10,30 @@
 MAKEFILE.dist := $(lastword $(MAKEFILE_LIST))
 
 ########################################################################
-# Chicken/egg situation: we need $(bin.version-info) to get the version
-# info for the archive name, but that binary may not yet be built, and
-# won't be built until we expand the dependencies. We have to use a
-# temporary name for the archive.
-dist-name = sqlite-wasm-TEMP
-#ifeq (0,1)
-#  $(info WARNING  *******************************************************************)
-#  $(info ** Be sure to create the desired build configuration before creating the)
-#  $(info ** distribution archive. Use one of the following targets to do so:)
-#  $(info **)
-#  $(info **   o2: builds with -O2, resulting in the fastest builds)
-#  $(info **   oz: builds with -Oz, resulting in the smallest builds)
-#  $(info /WARNING *******************************************************************)
-#endif
+# Chicken/egg situation: we need $(bin.version-info) to get the
+# version info for the archive name, but that binary may not yet be
+# built, and won't be built until we expand the dependencies. Thus we
+# have to use a temporary name for the archive until we can get
+# that binary built.
+ifeq (,$(filter snapshot,$(MAKECMDGOALS)))
+dist-name-prefix := sqlite-wasm
+else
+dist-name-prefix := sqlite-wasm-snapshot-$(shell /usr/bin/date +%Y%m%d)
+endif
+dist-name := $(dist-name-prefix)-TEMP
 
 ########################################################################
-# dist.build must be the name of a target which triggers the
-# build of the files to be packed into the dist archive.  The
-# intention is that it be one of (o0, o1, o2, o3, os, oz), each of
-# which uses like-named -Ox optimization level flags. The o2 target
-# provides the best overall runtime speeds. The oz target provides
-# slightly slower speeds (roughly 10%) with significantly smaller WASM
-# file sizes. Note that -O2 (the o2 target) results in faster binaries
-# than both -O3 and -Os (the o3 and os targets) in all tests run to
-# date.
+# dist.build must be the name of a target which triggers the build of
+# the files to be packed into the dist archive.  The intention is that
+# it be one of (o0, o1, o2, o3, os, oz), each of which uses like-named
+# -Ox optimization level flags. The o2 target provides the best
+# overall runtime speeds. The oz target provides slightly slower
+# speeds (roughly 10%) with significantly smaller WASM file
+# sizes. Note that -O2 (the o2 target) results in faster binaries than
+# both -O3 and -Os (the o3 and os targets) in all tests run to
+# date. Our general policy is that we want the smallest binaries for
+# dist zip files, so use the oz build unless there is a compelling
+# reason not to.
 dist.build ?= oz
 
 dist-dir.top := $(dist-name)
@@ -52,7 +51,7 @@ dist.common.extras := \
     $(wildcard $(dir.common)/*.css) \
     $(dir.common)/SqliteTestUtil.js
 
-.PHONY: dist
+.PHONY: dist snapshot
 ########################################################################
 # dist: create the end-user deliverable archive.
 #
@@ -84,7 +83,7 @@ dist: \
        @cp -p $(dist.common.extras) $(dist-dir.common)
        @set -e; \
                vnum=$$($(bin.version-info) --download-version); \
-               vdir=sqlite-wasm-$$vnum; \
+               vdir=$(dist-name-prefix)-$$vnum; \
                arczip=$$vdir.zip; \
                echo "Making $$arczip ..."; \
                rm -fr $$arczip $$vdir; \
@@ -94,7 +93,7 @@ dist: \
                ls -la $$arczip; \
                set +e; \
                unzip -lv $$arczip || echo "Missing unzip app? Not fatal."
-
+snapshot: dist
 # We need a separate `clean` rule to account for weirdness in
 # a sub-make, where we get a copy of the $(dist-name) dir
 # copied into the new $(dist-name) dir.

diff --git a/manifest b/manifest
index ae619fc5168e91b2465cbf9b60763d091f535632..03022549e271b748ac3ead6157db623d1f3378d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sin\sthe\sESM-related\spreprocessor\sfiltering.
-D 2022-11-20T01:15:22.201
+C Add\s'snapshot'\starget\sto\screate\sdistinctly-named\ssnapshot\sbuilds\sof\sthe\swasm\sdeliverables\szip\sfile.
+D 2022-11-20T04:13:16.594
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -527,7 +527,7 @@ F ext/wasm/demo-worker1-promiser.html 1de7c248c7c2cfd4a5783d2aa154bce62d74c6de98
 F ext/wasm/demo-worker1-promiser.js b85a2bb1b918db4f09dfa24419241cb3edad7791389425c2505092e9b715017d
 F ext/wasm/demo-worker1.html 2c178c1890a2beb5a5fecb1453e796d067a4b8d3d2a04d65ca2eb1ab2c68ef5d
 F ext/wasm/demo-worker1.js a619adffc98b75b66c633b00f747b856449a134a9a0357909287d80a182d70fa
-F ext/wasm/dist.make d00562b499096704304d9879f834a76475c8dd7ac58aaa3f039625ecc299aa3d
+F ext/wasm/dist.make ff970852dbf879c8e29a3b060b4451d54ea309cc5373feb746bce96a256cfce8
 F ext/wasm/fiddle.make 2812c44c9bafb5be9c8767963d1b9f374d77af7795fcaa06483c03e7059dea74
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/fiddle/fiddle-worker.js b4a0c8ab6c0983218543ca771c45f6075449f63a1dcf290ae5a681b2cba8800d
@@ -2057,8 +2057,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 f40bf2c642643ae61d331e8d4815f601224fa258ab34344c6756966163a89f4a
-R bd56fdaa00a2ddbbb971d4117ea354ba
+P 205884a273128bb666b496b659b4fa9f031ebdbbc1aa704fdeb4b7e015740098
+R 68583681205ba1b84e3374ab2ab4b57b
 U stephan
-Z faec45069379feabec016e0ee445a4ae
+Z 0d4fea2843b4049473725debb938394b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f65f59d3a4d3f829d71bf4951cf639bc088101e..d32aa7bfc418a851f365575ee1f192dad81c902b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-205884a273128bb666b496b659b4fa9f031ebdbbc1aa704fdeb4b7e015740098
\ No newline at end of file
+f7620aa09e4893971e00cdee5c6f1fe15c3bd21f985bec90fbd90fdfc457ac31
\ No newline at end of file