Minor build docs and cleanups.

FossilOrigin-Name: 0eb96ea2d153c0f7bd9743b759849c95b3e9f1e6e4a9cdb30c26aa2ca43c1e14

diff --git a/Makefile.in b/Makefile.in
index 8f559e4570c9d3f29f2d677ffb7c89b7569c6985..46e9b70b2a78af9ffb0e9ac5742cb83c74508e3f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -262,10 +262,13 @@ sqlite_cfg.h: $(TOP)/sqlite_cfg.h.in $(AS_AUTO_DEF)
 # call-compatible wrapper, e.g. $(TOP)/tool/emcc.sh. If it's empty,
 # build components requiring Emscripten will not build.
 #
+# Achtung: though _this_ makefile is POSIX-make compatible, the fiddle
+# build requires GNU make.
+#
 EMCC_WRAPPER = @EMCC_WRAPPER@
 fiddle: sqlite3.c shell.c
        @if [ x = "x$(EMCC_WRAPPER)" ]; then \
-               echo "Emscripten's emcc not found. Cannot build fiddle." 1&>2; \
+               echo "Emscripten SDK not found by configure. Cannot build fiddle." 1&>2; \
                exit 1; \
        fi
        $(MAKE) -C ext/wasm fiddle emcc_opt=-Os

diff --git a/auto.def b/auto.def
index 890a767bd7e5485e8eca5a5a2e5df8755c9ed6d2..1a574ebc08e3a99b16a2991c35ec0edd887d8ae5 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -3,6 +3,15 @@
 #
 # This is the main autosetup-compatible configure script for the
 # SQLite project.
+#
+# This script should be kept compatible with JimTCL, a copy of which
+# is included in this source tree as ./autosetup/jimsh0.c. The number
+# of incompatibilities between canonical TCL and JimTCL is very low
+# and alternative formulations of incompatible constructs have, so
+# far, been easy to find.
+#
+# JimTCL: https://jim.tcl.tk
+#
 use cc cc-db cc-shared cc-lib hwaci-common
 set DUMP_DEFINES_FILE ./defines.list
 
@@ -13,6 +22,9 @@ if {[get-define host] ne [get-define build]} {
 }
 
 ########################################################################
+# Regarding flag compatibility with the historical autotool configure
+# script:
+#
 # A very long story made short, autosetup's --flag handling has
 # some behaviors which make it impossible to implement 100% identical
 # flags compared to the historical autotools build. The differences
@@ -845,7 +857,7 @@ if {![get-define HAVE_WASI_SDK] && [hwaci-check-emsdk]} {
   catch {exec chmod u+x $emccsh}
 } else {
   define EMCC_WRAPPER ""
-  catch {file delete -force $emccsh}
+  file delete -force $emccsh
 }
 unset emccsh
 

diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl
index 0729abacf00927f7b6466c8ca5fca10a8e1bbf1b..30cce478be65e98999bff043c6abbe64e8d48fc0 100644 (file)
--- a/autosetup/hwaci-common.tcl
+++ b/autosetup/hwaci-common.tcl
@@ -643,7 +643,6 @@ proc hwaci-check-emsdk {} {
   define EMSDK_HOME ""
   define EMSDK_ENV ""
   define BIN_EMCC ""
-  #  define EMCC_OPT "-Oz"
   msg-checking "Emscripten SDK? "
   if {$emsdkHome eq ""} {
     # Fall back to checking the environment. $EMSDK gets set by
@@ -660,7 +659,6 @@ proc hwaci-check-emsdk {} {
       set rc 1
       set emcc "$emsdkHome/upstream/emscripten/emcc"
       if {[file exists $emcc]} {
-        # puts "is emcc == $emcc ???"
         define BIN_EMCC $emcc
       }
     } else {

diff --git a/manifest b/manifest
index 5904c03a3e970a7982ef9fe11687bf763d66b9a4..02c18db41346b5590f7289c3e03ee73dc785361e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Minor\scleanups\sto\show\sconfigure\sgenerates\stool/emcc.sh.
-D 2024-10-22T13:02:48.260
+C Minor\sbuild\sdocs\sand\scleanups.
+D 2024-10-22T17:57:22.975
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in c6f6af495b8bdbc106a258efcafa15f007e00d883ce7bbc4567d88ab674b3e1b
+F Makefile.in 0997c8fc9c49bf2f4ac0df34575e3b502aa56255d86d2e3c66712296ee64fdf2
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -14,7 +14,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def 161d52a60891a6d17beca0ad79838d6dbbff6b1cfb079dc1afc1b6ae25ef031c
+F auto.def 3902f1d2f338750039b67e8b873635a6dc4127070d702f46d80010d71d9d81b8
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -48,7 +48,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/hwaci-common.tcl e2a8a47eae0540179922cebc71c8f89a9dd57e1fbd87baa608d1ef68c84f79b8
+F autosetup/hwaci-common.tcl 7a033b0b799960363530abfdff156da8c74a8822cf4dfcab4c7c86c5e918c6e5
 F autosetup/jimsh0.c 1b5fe91fffcddbc29f2b16acb80f1650632ea2edbe8336b8155ef7b4c66f6d8d
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -2240,8 +2240,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 24e0f6ecc67615a2a8c2df08aa47a782cf692fb1a5a59246eab83c0232e78edc
-R d8de8f893f2f9d4ef4213358a88a8c4d
+P 4484b4623684b09df018f85d95a2b2894a13f38013902831be20a263db605001
+R b34fe42beb3d9914cf9f463eff0df795
 U stephan
-Z 14f63c9cbf98b7ad4195a656fe3f2aa0
+Z c63a701aa7d14ae8f70fde7cbc469898
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ce7b24f5d994e6dc6d334ad380799929f7725a6a..ca07943c973ff8fbd09d4142ca690f7323acdd64 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4484b4623684b09df018f85d95a2b2894a13f38013902831be20a263db605001
+0eb96ea2d153c0f7bd9743b759849c95b3e9f1e6e4a9cdb30c26aa2ca43c1e14