From: stephan <stephan@noemail.net>
Date: Sat, 28 Sep 2024 00:02:52 +0000 (+0000)
Subject: Merge wasm-build-rework branch into trunk. Summary: 1) add optional bare-bones build... 
X-Git-Tag: version-3.47.0~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c58039e9e119970e4f39325a4430bcf4611eed8;p=thirdparty%2Fsqlite.git

Merge wasm-build-rework branch into trunk. Summary: 1) add optional bare-bones build, stripped of many optional library features, 2) replace much of the hyper-spaghetti wasm-specific makefile code with a more legible static code generator.

FossilOrigin-Name: 208c27714646c9bc26eef11266086a71da04bc24e87078de0955e7beb68a821e
---

3c58039e9e119970e4f39325a4430bcf4611eed8
diff --cc ext/wasm/GNUmakefile
index 51531627b9,bada548b45..d98a0cb8ed
--- a/ext/wasm/GNUmakefile
+++ b/ext/wasm/GNUmakefile
@@@ -35,25 -36,34 +36,21 @@@
  # - wasm-strip for release builds: https://github.com/WebAssembly/wabt
  # - InfoZip for 'dist' zip file
  ########################################################################
--#
--# Significant TODOs for this build include, but are not necessarily
--# limited to:
--#
--# 1) Consolidate the code generation for sqlite3*.*js into a script
--#    which generates the makefile code, rather than using $(call) and
--#    $(eval), or at least centralize the setup of the numerous vars
--#    related to each build variant $(JS_BUILD_MODES). (Update: an
--#    external script was attempted but generating properly-escaped
--#    makefile code from within a shell script is even less legible
- #    than the $(eval) indirection going on in this file.)
 -#    than the $(eval) indirection going on in this file.) (Update 2:
 -#    a second attempt at that make yet another mess of it.)
--#
  default: all
  #default: quick
- SHELL := $(shell which bash 2>/dev/null)
+ SHELL := $(firstword $(wildcard /usr/local/bin/bash /usr/bin/bash /bin/bash))
+ ifeq (,$(SHELL))
+   $(error Cannot find the bash shell)
+ endif
  MAKEFILE := $(lastword $(MAKEFILE_LIST))
  CLEAN_FILES :=
- DISTCLEAN_FILES := ./--dummy--
- release: oz
+ DISTCLEAN_FILES :=
+ MAKING_CLEAN := $(if $(filter %clean,$(MAKECMDGOALS)),1,0)
+ .PHONY: clean distclean
+ clean:
+ 	-rm -f $(CLEAN_FILES)
+ distclean: clean
+ 	-rm -f $(DISTCLEAN_FILES)
  
  ########################################################################
  # JS_BUILD_NAMES exists for documentation purposes only. It enumerates
diff --cc manifest
index 00d8d3f66e,60f8d5d218..ff89df3542
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Squash\ssign-comparison\swarnings\sreported\sin\s[forum:5e605a763a65c3f8\s|\sforum\spost\s5e605a763a65c3f8].
- D 2024-09-27T16:20:03.346
 -C Fix\sfiddle\sbuild\sbroken\sby\srecent\sbuild-level\sreworks.\sRemove\sa\sstale\sreference\sto\san\sold\sCSS\sfile.
 -D 2024-09-27T23:45:40.854
++C Merge\swasm-build-rework\sbranch\sinto\strunk.\sSummary:\s1)\sadd\soptional\sbare-bones\sbuild,\sstripped\sof\smany\soptional\slibrary\sfeatures,\s2)\sreplace\smuch\sof\sthe\shyper-spaghetti\swasm-specific\smakefile\scode\swith\sa\smore\slegible\sstatic\scode\sgenerator.
++D 2024-09-28T00:02:52.169
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -603,7 -601,7 +603,7 @@@ F ext/userauth/sqlite3userauth.h 7f3ea8
  F ext/userauth/user-auth.txt ca7e9ee82ca4e1c1744295f8184dd70edfae1992865d26c64303f539eb6c084c
  F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
  F ext/wasm/EXPORTED_FUNCTIONS.fiddle.in 27450c8b8c70875a260aca55435ec927068b34cef801a96205adb81bdcefc65c
- F ext/wasm/GNUmakefile d4f6586d9a36ee2869a8c7f77227a8b7f42b6c4623f3be594beafb1554ab20d9
 -F ext/wasm/GNUmakefile 4e2be9c8bed22922703f3ed6bb2444ff7c5b1053e466421e69a57c664d7a042d
++F ext/wasm/GNUmakefile 34a4590ae3f7ce5a70bf1c6f0384a7935e6c9809281e40165381ba04df34ceae
  F ext/wasm/README-dist.txt 6382cb9548076fca472fb3330bbdba3a55c1ea0b180ff9253f084f07ff383576
  F ext/wasm/README.md a8a2962c3aebdf8d2104a9102e336c5554e78fc6072746e5daf9c61514e7d193
  F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff
@@@ -611,12 -609,9 +611,9 @@@ F ext/wasm/SQLTester/SQLTester.mjs ce76
  F ext/wasm/SQLTester/SQLTester.run.mjs c72b7fe2072d05992f7a3d8c6a1d34e95712513ceabe40849784e24e41c84638
  F ext/wasm/SQLTester/index.html 3f8a016df0776be76605abf20e815ecaafbe055abac0e1fe5ea080e7846b760d
  F ext/wasm/SQLTester/touint8array.c 2d5ece04ec1393a6a60c4bf96385bda5e1a10ad49f3038b96460fc5e5aa7e536
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-auth 7ac80cc3b6a6d52e041bb295e85555ce797be78c15ef2008a64ae58815014080
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-core 400213eb52a7e5ad5f448053d375cacf4dac2cf45d134f3edfe485ae4a49a183
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-preupdate d1d62a2212099f2c0782d730beb8cb84a7a52d99c15ead2cb9b1411fff5fd6b1
+ F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-core 2bcbbfe3b95c043ed6037e2708a2ee078d212dd1612c364f93588d8dc97300fe
 -F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13
++F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-extras fe40d6d758646e38f8b15f709044951e10884214f5453d35502100179c388c13 w ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-session
  F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-see fb29e62082a658f0d81102488414d422c393c4b20cc2f685b216bc566237957b
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-session 213b6c04267cb9bd760172db011eb1650732805fb3d01f9395478a8ceec18eb0
- F ext/wasm/api/EXPORTED_FUNCTIONS.sqlite3-vtab fd57af1f4502a052be27d8402df74be1dc60fcb6a687d372972abd90e424120a
  F ext/wasm/api/EXPORTED_RUNTIME_METHODS.sqlite3-api 1ec3c73e7d66e95529c3c64ac3de2470b0e9e7fbf7a5b41261c367cf4f1b7287
  F ext/wasm/api/README.md 34fe11466f9c1d81b10a0469e1114e5f1c5a6365c73d80a1a6ca639a1a358b73
  F ext/wasm/api/extern-post-js.c-pp.js c4154a7f90c2d7e51fd6738273908152036c3457fdc0b6523f1be3ef51105aac
@@@ -2215,8 -2211,8 +2213,9 @@@ F vsixtest/vsixtest.tcl 6195aba1f12a5e1
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 27ef1909bb0c4d9470c6074b40500632c68341127a079a3eb3b6a19dbfb2aeac
- R 81a4d040bd5425cfeac10fd5ca0ed96b
 -P 5ccc85d8f5809d961602dff557dca1ed34f5db61203912387272034e4da02614
 -R b423c82bbaeaae132815dac1536d60b7
++P e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9 f904b3b7842da036c3e8423bae02cdf207573c92dc379a601eae289eb3c5f547
++R 00aae997005fe8baf8a0564b28d0f4b3
++T +closed f904b3b7842da036c3e8423bae02cdf207573c92dc379a601eae289eb3c5f547 Closed\sby\sintegrate-merge.
  U stephan
- Z 6359f322b683086f026c8375d9816233
 -Z 372446199cce1136dc510d3abff62856
++Z 285fd3333f337a65629db5a9e7f33975
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 40b51b8191,794a9bbd77..424b2a3a6c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e74fce93c518296bdb0a4273cd5fd3f785d37d27750ca456b61a3502135775f9
 -f904b3b7842da036c3e8423bae02cdf207573c92dc379a601eae289eb3c5f547
++208c27714646c9bc26eef11266086a71da04bc24e87078de0955e7beb68a821e