Remove some now-dead makefile code, rename a var for consistency, and fix a recipe...

FossilOrigin-Name: 0acd4ef3addb311476f4a670be0c4c4a0f3f88b0420886d4c1c3c3027dd51d73

diff --git a/ext/wasm/config.make.in b/ext/wasm/config.make.in
index 3218541b373c5e365e96efe3f5118a381a85bfe7..f30baac3f1ad5d9484271728c004b3a0bb6fed28 100644 (file)
--- a/ext/wasm/config.make.in
+++ b/ext/wasm/config.make.in
@@ -4,17 +4,12 @@ bin.emcc = @EMCC_WRAPPER@
 bin.wasm-strip = @BIN_WASM_STRIP@
 bin.wasm-opt = @BIN_WASM_OPT@
 
-ifeq (,$(bin.wasm-opt))
-  # wasm-opt is an optional optimization step. We install a dummy
-  # command in its place if it's not available to simplify the make
-  # recipes which use it.
-  #bin.wasm-opt = echo "[not wasm-opt]"
-endif
 SHELL := $(bin.bash)
 
-# The following overrides can be activated to test
-# various validation in GNUmakefile:
+# The following overrides can be uncommented to test various
+# validation and if/else branches the makefile code:
 #
 #bin.bash :=
 #bin.emcc :=
 #bin.wasm-strip :=
+#bin.wasm-opt :=

diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c
index 27aa3b156f9dcef5bbd63355285df6eef22fb0ec..738885ff3480a802962ffd5758cb4ce371d50649 100644 (file)
--- a/ext/wasm/mkwasmbuilds.c
+++ b/ext/wasm/mkwasmbuilds.c
@@ -69,7 +69,7 @@ static void mk_prologue(void){
   ** name) through $(bin.wasm-opt) */
   ps("ifeq (,$(bin.wasm-opt))");
   ps("define SQLITE.CALL.WASM-OPT");
-  ps("echo 'wasm-opt not available: $(1)'");
+  ps("echo 'wasm-opt not available for $(1)'");
   ps("endef");
   ps("else");
   ps("define SQLITE.CALL.WASM-OPT");
@@ -211,7 +211,7 @@ static void mk_lib_mode(const char *zName     /* build name */,
                         const char *zJsOut    /* name of generated sqlite3.js/.mjs */,
                         const char *zCmppD    /* extra -D flags for c-pp */,
                         const char *zEmcc     /* extra flags for emcc */){
-  const char * zTgtWasmName = "$(basename $@).wasm"
+  const char * zWasmOut = "$(basename $@).wasm"
     /* The various targets named X.js or X.mjs (zJsOut) also generate
     ** X.wasm, and we need that part of the name to perform some
     ** post-processing after Emscripten generates X.wasm. */;
@@ -260,12 +260,12 @@ static void mk_lib_mode(const char *zName     /* build name */,
        0==strcmp("sqlite3-wasmfs", zName) ? 1 : 0);
   }
   pf("\t@chmod -x %s; \\\n"
-     "\t$(maybe-wasm-strip) %s;\n",
-     zTgtWasmName, zTgtWasmName);
-  pf("\t@$(call SQLITE.CALL.WASM-OPT,%s)\n", zTgtWasmName);
+     "\t\t$(maybe-wasm-strip) %s;\n",
+     zWasmOut, zWasmOut);
+  pf("\t@$(call SQLITE.CALL.WASM-OPT,%s)\n", zWasmOut);
   pf("\t@sed -i -e '/^var _sqlite3.*createExportWrapper/d' %s || exit; \\\n"
      /*  ^^^^^^ reminder: Mac/BSD sed has no -i flag */
-     "\techo 'Stripped out createExportWrapper() parts.'\n",
+     "\t\techo 'Stripped out createExportWrapper() parts.'\n",
      zJsOut) /* Our JS code installs bindings of each WASM export. The
                 generated Emscripten JS file does the same using its
                 own framework, but we don't use those results and can
@@ -273,20 +273,23 @@ static void mk_lib_mode(const char *zName     /* build name */,
                 considerably, by stripping them out. */;
   /*
   ** The above $(bin.emcc) call will write zJsOut and will create a
-  ** like-named .wasm file. That .wasm file name gets hard-coded into
-  ** zJsOut so we need to, for some cases, patch zJsOut to use the
-  ** name sqlite3.wasm instead. Note that the resulting .wasm file is
-  ** identical for all builds for which zEmcc is empty.
+  ** like-named .wasm file (zWasmOut). That .wasm file name gets
+  ** hard-coded into zJsOut so we need to, for some cases, patch
+  ** zJsOut to use the name sqlite3.wasm instead. Note that the
+  ** resulting .wasm file is identical for all builds for which zEmcc
+  ** is empty.
   */
   if( 0==strcmp("bundler-friendly", zMode)
       || 0==strcmp("node", zMode) ){
     pf("\t@echo 'Patching $@ for %s.wasm...'; \\\n", zName);
-    pf("\trm -f %s; \\\n", zTgtWasmName);
-    pf("\tsed -i -e 's/%s-%s.wasm/%s.wasm/g' $@ || exit;\n",
+    pf("\t\trm -f %s; \\\n", zWasmOut);
+    pf("\t\tsed -i -e 's/%s-%s.wasm/%s.wasm/g' $@ || exit;\n",
        /* ^^^^^^ reminder: Mac/BSD sed has no -i flag */
        zNM, zName);
+    pf("\t@ls -la $@\n");
+  }else{
+    pf("\t@ls -la %s $@\n", zWasmOut);
   }
-  pf("\t@ls -la %s $@\n", zTgtWasmName);
   if( 0!=strcmp("sqlite3-wasmfs", zName) ){
     /* The sqlite3-wasmfs build is optional and needs to be invoked
     ** conditionally using info we don't have here. */

diff --git a/manifest b/manifest
index a531e945683a71da792e48d3c293824da1e2636b..db22f48ef3d5676f11caf0b75102fbd05490bb54 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\ssupport\sfor\spost-processing\swasm\sfiles\swith\swasm-opt\s(if\sit's\savailable).\sThis\scurrently\sshaves\s12kb\soff\sof\sthe\srelease-mode\sbuild\sof\ssqlite3.wasm\sbut\sthere\sare\smany\sdozens\sof\swasm-opt\sflags\sleft\sto\stry.
-D 2025-01-23T15:58:01.776
+C Remove\ssome\snow-dead\smakefile\scode,\srename\sa\svar\sfor\sconsistency,\sand\sfix\sa\srecipe\sbug\sintroduced\sin\sthe\sprevious\scheckin\sin\sthe\sbundler-friendly\sbuild.
+D 2025-01-23T16:11:24.436
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -659,7 +659,7 @@ F ext/wasm/common/SqliteTestUtil.js 7adaeffef757d8708418dc9190f72df22367b5318317
 F ext/wasm/common/emscripten.css 11bd104b6c0d597c67d40cc8ecc0a60dae2b965151e3b6a37fa5708bac3acd15
 F ext/wasm/common/testing.css e97549bab24126c24e0daabfe2de9bb478fb0a69fdb2ddd0a73a992c091aad6f
 F ext/wasm/common/whwasmutil.js d76c69617e95d85ffc9996f7d9d7481df6976dcbd860ecd82bd8c075e3a101ae
-F ext/wasm/config.make.in a44a2f9657c80c9ef0f5a462937a7c2f64916c8b99fb0a28b67d37f961997c94
+F ext/wasm/config.make.in 4bc43443f768a61efd43cf995a5e618f58ac9afc0936706014193537d82c41cb
 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed
 F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508
 F ext/wasm/demo-123.js c7b3cca50c55841c381a9ca4f9396e5bbdc6114273d0b10a43e378e32e7be5bf
@@ -679,7 +679,7 @@ F ext/wasm/index-dist.html 564b5ec5669676482c5a25dea9e721d8eafed426ecb155f93d29a
 F ext/wasm/index.html e4bbffdb3d40eff12b3f9c7abedef91787e2935620b7f8d40f2c774b80ad8fa9
 F ext/wasm/jaccwabyt/jaccwabyt.js 1264710db3cfbcb6887d95665b7aeba60c1126eaef789ca4cf1a4a17d5bc7f54
 F ext/wasm/jaccwabyt/jaccwabyt.md 59a20df389abcc3606eb4eaea7fb7ba14504beb3e345dbea9b99a0618ba3bec8
-F ext/wasm/mkwasmbuilds.c 9f4e0527043a20fab98463e455eeaf287e58b01700248b213159b86a6c3fbb5f
+F ext/wasm/mkwasmbuilds.c 0c85aef64ac94f903964c046e7d5a291a95afbbc881d2a96b7871e825e1d175c
 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0a426a549577b883e2de7cd0605041cc97b57f53ee6657bc318b0bfde7b62677
-R 2d32486992b9b3356e014d934b282b6a
+P 5d16e3f28364de2d6b6456a6fc56bf604b9106c3ae15719f2862192ae3020cc1
+R f70ac1b6c598112d9638929ed475c3d8
 U stephan
-Z edbdf887524cd901e3308cf68c45b681
+Z e841368168cc448b3b9bb4f562d2f5fb
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d0f50acaa8a58d2ecae6b77689adc1e28a17e81f..374beb8fa4439e09c7de4a380fb746e8f8cbdfc7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5d16e3f28364de2d6b6456a6fc56bf604b9106c3ae15719f2862192ae3020cc1
+0acd4ef3addb311476f4a670be0c4c4a0f3f88b0420886d4c1c3c3027dd51d73