From: stephan Date: Mon, 19 Jan 2026 22:20:12 +0000 (+0000) Subject: Minor doc updates in mkwasmbuilds.c. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a613aa4631a6730ac0d8c31070cadf4a4a5905;p=thirdparty%2Fsqlite.git Minor doc updates in mkwasmbuilds.c. FossilOrigin-Name: 81840bd4b2132c1c701bb6fd5a2ac48a4ed33d2b68a3f7a826fa32dc0fc16483 --- diff --git a/ext/wasm/mkwasmbuilds.c b/ext/wasm/mkwasmbuilds.c index af76707e2c..1b8b3d02ba 100644 --- a/ext/wasm/mkwasmbuilds.c +++ b/ext/wasm/mkwasmbuilds.c @@ -40,14 +40,22 @@ /* ** Flags for use with BuildDef::flags. ** -** Maintenance reminder: do not combine flags within this enum, -** e.g. F_BUNDLER_FRIENDLY=0x02|F_ESM, as that will lead -** to breakage in some of the flag checks. +** Maintenance reminder: do not combine F_... flags within this enum, +** e.g. F_BUNDLER_FRIENDLY=0x02|F_ESM, as that will lead to breakage +** in some of the flag checks. */ enum BuildDefFlags { /* Indicates an ESM module build. */ F_ESM = 0x01, - /* Indicates a "bundler-friendly" build mode. */ + /* Indicates a "bundler-friendly" build mode. These are untested and + ** unsupported, provided solely for the downstream npm subproject + ** (who is responsible for any testing of these). + ** + ** The only difference beween bundler-friendly and esm builds is + ** that bundlers require static filename strings in a few places due + ** to limitations of bundler tooling, whereas vanilla and JS can + ** both work with dynamic strings. + */ F_BUNDLER_FRIENDLY = 1<<1, /* Indicates that this build is unsupported. Such builds are not ** added to the 'all' target. The unsupported builds exist primarily @@ -57,8 +65,11 @@ enum BuildDefFlags { F_NOT_IN_ALL = 1<<3, /* If it's a 64-bit build. */ F_64BIT = 1<<4, - /* Indicates a node.js-for-node.js build (untested and - ** unsupported). */ + /* Indicates a node.js-for-node.js build. This build is very + ** specificially untested and unsupported, but the downstream npm + ** project makes use of it. None of our JS code is specific to node, + ** but Emscripten's generated sqlite3.js differs between + ** for-the-browser and for-node builds. */ F_NODEJS = 1<<5, /* Indicates a wasmfs build (untested and unsupported). */ F_WASMFS = 1<<6, @@ -77,7 +88,7 @@ enum BuildDefFlags { ** differ, however. */ CP_JS = 1 << 30, /* X.js or X.mjs, depending on F_ESM */ - CP_WASM = 1 << 31, /* X,wasm */ + CP_WASM = 1 << 31, /* X.wasm */ CP_ALL = CP_JS | CP_WASM }; @@ -140,7 +151,7 @@ struct BuildDef { ** ** The convention for 32- vs 64-bit pairs is to give them similar ** emoji, e.g. a cookie for 32-bit and a donut or cake for 64. - ** Alternately, the same emoji a "64" suffix, except that that + ** Alternately, the same emoji with a "64" suffix, except that that ** throws off the output alignment in parallel builds ;). */ const char *zEmo; @@ -164,7 +175,7 @@ struct BuildDef { ** Makefile code "ifeq (...)". If set, this build is enclosed in a ** $zIfCond/endif block. */ - const char *zIfCond; /* makefile "ifeq (...)" or similar */ + const char *zIfCond; int flags; /* Flags from BuildDefFlags */ }; typedef struct BuildDef BuildDef; @@ -180,7 +191,7 @@ typedef struct BuildDef BuildDef; ** logtag.NAME = Used for decorating log output ** ** etc. -***/ +*/ #define BuildDefs_map(E) \ E(vanilla) E(vanilla64) \ E(esm) E(esm64) \ @@ -482,8 +493,8 @@ static void mk_prologue(void){ ** configuration). Comments like "saves nothing" may not be ** technically correct: "nothing" means "some neglible amount." ** - ** Note that performance gains/losses are _not_ taken into - ** account here: only wasm file size. + ** Performance gains or losses are _not_ taken into account + ** here, only wasm file size. */ "--enable-bulk-memory-opt " /* required */ "--all-features " /* required */ @@ -1052,7 +1063,7 @@ int main(int argc, char const ** argv){ BuildDefs_map(E) if( 0==strcmp("prologue",zArg) ){ mk_prologue(); }else { - fprintf(stderr,"Unkown build name: %s\n", zArg); + fprintf(stderr,"Unknown build name: %s\n", zArg); rc = 1; break; } diff --git a/manifest b/manifest index 3e901d5695..b510886850 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C wasm:\sremove\sthe\sbundler-friend\sbuilds\sfrom\sthe\s'all'\starget,\sas\sthey're\sonly\sneeded\sfor\sthe\s'npm'\starget. -D 2026-01-19T22:01:10.095 +C Minor\sdoc\supdates\sin\smkwasmbuilds.c. +D 2026-01-19T22:20:12.220 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 475bc283338749db4e3fbf24cf3f5aa020cc85a1fffb780d400a915fcb F ext/wasm/jaccwabyt/jaccwabyt.js 4e2b797dc170851c9c530c3567679f4aa509eec0fab73b466d945b00b356574b F ext/wasm/jaccwabyt/jaccwabyt.md 6aa90fa1a973d0ad10d077088bea163b241d8470c75eafdef87620a1de1dea41 F ext/wasm/mkdist.sh f8883b077a2ca47cf92e6f0ce305fbf72ca648c3501810125056c4b09c2d5554 x -F ext/wasm/mkwasmbuilds.c 1611a8d0a56fb99faf1ea0af8c8e0c6d4d0d683ec730e1e548fc25eff3dd350e +F ext/wasm/mkwasmbuilds.c 5d7baa9258299fd492351578a93dff960317822a08ee3ad6dd91ef5d21209812 F ext/wasm/module-symbols.html e54f42112e0aac2a31f850ab33e7f2630a2ea4f63496f484a12469a2501e07e2 F ext/wasm/scratchpad-wasmfs.html a3d7388f3c4b263676b58b526846e9d02dfcb4014ff29d3a5040935286af5b96 F ext/wasm/scratchpad-wasmfs.mjs 66034b9256b218de59248aad796760a1584c1dd842231505895eff00dbd57c63 @@ -2193,8 +2193,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 67c0d11701842baaa5227ccce02483ead07bec8426b9861f2e2a0465414ae382 -R efc64949e85940e17bcc69431d2b9822 +P dfe4b788ca6596ea9f26445c864f56f81c7816798f5fedfc4e89ba1eb097b0aa +R fa51d38900cab116d6f57002d22a4966 U stephan -Z 4c7d1c784953bb323249ad2660014d87 +Z 05cbd873e079ce2b55a58f6226132035 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 409136fe75..c54a1660c7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dfe4b788ca6596ea9f26445c864f56f81c7816798f5fedfc4e89ba1eb097b0aa +81840bd4b2132c1c701bb6fd5a2ac48a4ed33d2b68a3f7a826fa32dc0fc16483