From: stephan <stephan@noemail.net>
Date: Fri, 26 Sep 2025 19:30:34 +0000 (+0000)
Subject: Consolidate some duplicate code in mkwasmbuilds.c.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e309de27f980f4dfdaab98e84fb4aae35821a198;p=thirdparty%2Fsqlite.git

Consolidate some duplicate code in mkwasmbuilds.c.

FossilOrigin-Name: 1078aa4f1e5685d45e31eea622865ddd077f367f1cec90fc267e8ba50cbe2ee9
---

diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c
index daf24611b3..78b33be1c1 100644
--- a/ext/wasm/mkwasmbuilds.c
+++ b/ext/wasm/mkwasmbuilds.c
@@ -693,6 +693,18 @@ static void emit_compile_start(char const *zBuildName){
      zBuildName);
 }
 
+static void emit_logtag(char const *zBuildName){
+#if 1
+  pf("logtag.%s ?= [$(emo.b.%s)$(if $@, $@,)]:\n",
+     zBuildName, zBuildName);
+#else
+  pf("logtag.%s ?= [$(emo.b.%s) [%s] $@]:\n",
+     zBuildName, zBuildName, zBuildName);
+#endif
+  pf("$(info $(logtag.%s) Setting up target b-%s)\n",
+     zBuildName, zBuildName );
+}
+
 /**
    Emit rules for sqlite3-api.${zBuildName}.js.  zCmppD is optional
    flags for $(bin.c-pp).
@@ -733,19 +745,12 @@ static void mk_lib_mode(const char *zBuildName, const BuildDef * pB){
      "emo.b.%s = %s\n",
      zBuildName, zBuildName, pB->zEmo);
 
-#if 1
-  pf("logtag.%s ?= [%s $@]:\n", zBuildName, pB->zEmo);
-#else
-  pf("logtag.%s ?= [%s [%s] $@]:\n", zBuildName, pB->zEmo, zBuildName);
-#endif
+  emit_logtag(zBuildName);
 
   if( pB->zIfCond ){
     pf("%s\n", pB->zIfCond );
   }
 
-  pf("$(info $(logtag.%s) Setting up target b-%s)\n",
-     zBuildName, zBuildName );
-
   pf("dir.dout.%s ?= $(dir.dout)/%s\n", zBuildName, zBuildName);
 
   pf("out.%s.base ?= $(dir.dout.%s)/%s\n",
@@ -949,14 +954,11 @@ static void mk_fiddle(void){
 
     pf(zBanner "# Begin build %s\n", zBuildName);
     if( isDebug ){
-      pf("emo.%s = $(emo.fiddle)$(emo.bug)\n", zBuildName);
+      pf("emo.b.%s = $(emo.b.fiddle)$(emo.bug)\n", zBuildName);
     }else{
-      pf("emo.fiddle = 🎻\n");
+      pf("emo.b.fiddle = 🎻\n");
     }
-    pf("logtag.%s = [$(emo.%s) [%s] $@]:\n",
-       zBuildName, zBuildName, zBuildName);
-    pf("$(info $(logtag.%s) Setting up target b-%s)\n",
-       zBuildName, zBuildName );
+    emit_logtag(zBuildName);
 
     pf("dir.%s = %s\n"
        "out.%s.js = $(dir.%s)/fiddle-module.js\n"
diff --git a/manifest b/manifest
index 3ad3e5002b..a435ff1fa9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clean\sup\show\sthe\sspeedtest1\s64-bit\stest/demo\sfiles\sare\sgenerated.\sMake\slog\soutput\svery\sslightly\sless\sverbose.
-D 2025-09-26T19:19:35.085
+C Consolidate\ssome\sduplicate\scode\sin\smkwasmbuilds.c.
+D 2025-09-26T19:30:34.150
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -634,7 +634,7 @@ F ext/wasm/index.html 1b06cef70db4b2d5c0af1f9e6e32b27c1ca298cde97365a887926d501f
 F ext/wasm/jaccwabyt/jaccwabyt.js bbac67bc7a79dca34afe6215fd16b27768d84e22273507206f888c117e2ede7d
 F ext/wasm/jaccwabyt/jaccwabyt.md 167fc0b624c9bc2c477846e336de9403842d81b1a24fc4d3b24317cb9eba734f
 F ext/wasm/mkdist.sh 29f8a37a7aba41fa5df8e89b1fab02b83b35c43473c5cf808584872e022514b8 x
-F ext/wasm/mkwasmbuilds.c 54be38759216693a5afa1604fd7766bbb04ae5fcdcb454b2b1f118507af996d2
+F ext/wasm/mkwasmbuilds.c edf7f327730d242e02a6562b22d785c3d283876e978c7cd16bc99b1e18062027
 F ext/wasm/module-symbols.html dc476b403369b26a1a23773e13b80f41b9a49f0825e81435fe3600a7cfbbe337
 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96
 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 70b944cc0189309c2265b184381f2f050bced7b83f204d57b912def6e203982a
-R cdf67da6d9ea8326da6d3edd3f66f912
+P 64715e92708e4f8c5b82c1f4ed71b75f418bf741f7f05516eab309582fbfad2b
+R 89185099a4a37fe520acc0d423d2e065
 U stephan
-Z 0b0d6ed86cb9331997dcfa522b9261fe
+Z 81e474cb3fbbccb53fc554d9953b696c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 06f42c3a45..a7880efd8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-64715e92708e4f8c5b82c1f4ed71b75f418bf741f7f05516eab309582fbfad2b
+1078aa4f1e5685d45e31eea622865ddd077f367f1cec90fc267e8ba50cbe2ee9