diff --git a/auto.def b/auto.def index 5752e8404b..13daca806c 100644 --- a/auto.def +++ b/auto.def @@ -1,5 +1,4 @@ # Created by migrate-autoconf - fix items marked XXX - use cc cc-shared cc-lib hwaci-common set DUMP_DEFINES_FILE defines.list @@ -28,37 +27,39 @@ set DUMP_DEFINES_FILE defines.list # In trying to helpfully map between --foo/--enable-foo/--disable-foo, # it ends up creating some degree of confusion. options { - with-tclsh:PATHNAME => {Full pathname of tclsh to use} - with-tcl:DIR => {Directory containing tclConfig.sh} - tcl=1 => {Disable building accessory programs that require TCL-dev} - test-status => {Enable status of tests} - threadsafe=1 => {Disable mutexing} - releasemode => {libtool link to release mode} - tempstore=0 => {an in-ram database for temporary tables never,no,yes,always} - editline=0 => {BSD editline support} - readline=0 => {readline support} - with-readline-lib => {readline library} - with-readline-inc => {readline include paths} + with-tclsh:PATHNAME => {Full pathname of tclsh to use} + with-tcl:DIR => {Directory containing tclConfig.sh} + tcl=1 => {Disable building accessory programs that require TCL-dev} + test-status => {Enable status of tests} + threadsafe=1 => {Disable mutexing} + releasemode => {libtool link to release mode} + tempstore=0 => {an in-ram database for temporary tables never,no,yes,always} + editline=0 => {BSD editline support} + readline=0 => {readline support} + with-readline-lib => {readline library} + with-readline-inc => {readline include paths} with-linenoise:DIR => {} - amalgamation=1 => {Disable the amalgamation and instead build all files separately} - load-extension=1 => {Disable loading of external extensions} - math=1 => {Disable math functions} - json=1 => {Disable JSON functions} - all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} - memsys5 => {Enable MEMSYS5} - memsys3 => {Enable MEMSYS3} - fts3 => {Enable the FTS3 extension} - fts4 => {Enable the FTS4 extension} - fts5 => {Enable the FTS5 extension} - update-limit => {Enable the UPDATE/DELETE LIMIT clause} - geopoly => {Enable the GEOPOLY extension} - rtree => {Enable the RTREE extension} - session => {Enable the SESSION extension} - gcov => {Enable coverage testing using gcov} - with-wasi-sdk:=/opt/wasi-sdk => {Top-most dir of the wasi-sdk for a WASI build} - dump-defines=1 => {Dump autosetup defines to $DUMP_DEFINES_FILE} + amalgamation=1 => {Disable the amalgamation and instead build all files separately} + load-extension=1 => {Disable loading of external extensions} + math=1 => {Disable math functions} + json=1 => {Disable JSON functions} + all => {Enable FTS4, FTS5, Geopoly, RTree, Sessions} + memsys5 => {Enable MEMSYS5} + memsys3 => {Enable MEMSYS3} + fts3 => {Enable the FTS3 extension} + fts4 => {Enable the FTS4 extension} + fts5 => {Enable the FTS5 extension} + update-limit => {Enable the UPDATE/DELETE LIMIT clause} + geopoly => {Enable the GEOPOLY extension} + rtree => {Enable the RTREE extension} + session => {Enable the SESSION extension} + gcov => {Enable coverage testing using gcov} + linemacros => {Enable #line macros in the amalgamation.} + with-wasi-sdk:=/opt/wasi-sdk + => {Top-most dir of the wasi-sdk for a WASI build} + dump-defines=1 => {Dump autosetup defines to $DUMP_DEFINES_FILE} } -# debug=0 => {debugging & verbose explain} +# debug=0 => {debugging & verbose explain} set srcdir $autosetup(srcdir) puts "srcdir = $srcdir" @@ -139,13 +140,20 @@ proc add-feature-flag {flag} { ######################################################################## # Force-set autosetup option $flag to $val. +# +# BUG: dies with "missing value to go with key, which indicates an arg +# count error to [dict exists]. Why it does that is a mystery, though. proc opt-bool-set {flag {val 1}} { - if {![dict exists ::autosetup(options) $flag]} { + global autosetup + #puts "DEBUG: opt-bool-set $flag $val. DICT=<<$::autosetup(options)>>" + if {![dict exists $::autosetup(options) $flag]} { # We have to add this to autosetup(options) or else future calls # to [opt-bool $flag] will fail validation of $flag. dict set ::autosetup(options) $flag {} } dict set ::autosetup(optset) $flag $val + #puts "DEBUG: opt-bool-set $flag $val = [opt-bool $flag]" + #puts "DEBUG: opt-bool-set $flag $val = [dict get $::autosetup(optset) $flag]" } ######################################################################## @@ -199,8 +207,8 @@ if {1} { # # This must be early because it changes the toolchain. # -# It's unclear whether we can actually get away with these changes in -# autosetup. +# It's unclear whether we can actually get away with making these +# changes to the autosetup environment. if {1} { set wasiSdkDir [lindex [opt-val with-wasi-sdk] end] if {$wasiSdkDir eq ""} { @@ -397,13 +405,20 @@ if {0} { # XXX fi # XXX AC_SUBST BUILD_CC -if-enabled all { - opt-bool-set fts4 - opt-bool-set fts5 - opt-bool-set geopoly - opt-bool-set rtree - opt-bool-set session -} +#opt-bool-set why-does-this-puke +#if-enabled all { +# opt-bool-set fts4 +# opt-bool-set fts5 +# opt-bool-set geopoly +# opt-bool-set rtree +# opt-bool-set session +#} + +#if-enabled geopoly {opt-bool-set rtree} +#if {[opt-bool geopoly]} { +# opt-bool-set rtree +#} + ########## # Do we want to support multithreaded use of sqlite @@ -793,69 +808,6 @@ if {0} { # XXX fi } - -if {0} { - ######### - # See whether we should enable the LIMIT clause on UPDATE and DELETE - # statements. - if {[opt-bool update-limit]} { - } - msg-checking "Checking whether to support LIMIT on UPDATE and DELETE statements..." - # XXX if test "${enable_update_limit}" = "yes" ; then - # XXX OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - msg-result "yes" - # XXX else - msg-result "no" - # XXX fi -} - -if {0} { - ######### - # See whether we should enable GEOPOLY - if {[opt-bool geopoly]} { - set enable_geopoly yes - } else { - set enable_geopoly no - } - msg-checking "Checking whether to support GEOPOLY..." - # XXX if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then - # XXX OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY" - set enable_rtree yes - msg-result "yes" - # XXX else - msg-result "no" - # XXX fi -} - -if {0} { - ######### - # See whether we should enable RTREE - if {[opt-bool rtree]} { - } - msg-checking "Checking whether to support RTREE..." - # XXX if test "${enable_rtree}" = "yes" ; then - # XXX OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE" - msg-result "yes" - # XXX else - msg-result "no" - # XXX fi -} - -if {0} { - ######### - # See whether we should enable the SESSION extension - if {[opt-bool session]} { - } - msg-checking "Checking whether to support SESSION..." - # XXX if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then - # XXX OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION" - # XXX OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK" - msg-result "yes" - # XXX else - msg-result "no" - # XXX fi -} - ######### # attempt to duplicate any OMITS and ENABLES into the ${OPT_FEATURE_FLAGS} parameter # XXX for option in $CFLAGS $CPPFLAGS @@ -867,7 +819,6 @@ if {0} { # XXX done # XXX AC_SUBST OPT_FEATURE_FLAGS - # attempt to remove any OMITS and ENABLES from the $(CFLAGS) parameter # XXX ac_temp_CFLAGS="" # XXX for option in $CFLAGS @@ -880,7 +831,6 @@ if {0} { # XXX done # XXX CFLAGS=$ac_temp_CFLAGS - # attempt to remove any OMITS and ENABLES from the $(CPPFLAGS) parameter # XXX ac_temp_CPPFLAGS="" # XXX for option in $CPPFLAGS @@ -893,7 +843,6 @@ if {0} { # XXX done # XXX CPPFLAGS=$ac_temp_CPPFLAGS - # attempt to remove any OMITS and ENABLES from the $(BUILD_CFLAGS) parameter # XXX ac_temp_BUILD_CFLAGS="" # XXX for option in $BUILD_CFLAGS @@ -907,44 +856,37 @@ if {0} { # XXX BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS -if {0} { - ######### - # See whether we should use GCOV - if {[opt-bool gcov]} { - } - # XXX if test "${use_gcov}" = "yes" ; then - # XXX USE_GCOV=1 - # XXX else - # XXX USE_GCOV=0 - # XXX fi - # XXX AC_SUBST USE_GCOV -} - -if {0} { - ######### - # Enable/disabled amalagamation line macros - ######## - set linemacros 0 - # XXX if test "${amalgamation_line_macros}" = "yes" ; then - set linemacros 1 - # XXX fi - # XXX if test "${amalgamation_line_macros}" = "no" ; then - set linemacros 0 - # XXX fi - # XXX AC_SUBST AMALGAMATION_LINE_MACROS +if-enabled gcov { + define USE_GCOV 1 + msg-result "Enabling gcov" +} { + define USE_GCOV 0 } foreach {boolFlag featureFlag} { - fts4 -DSQLITE_ENABLE_FTS4 - fts5 -DSQLITE_ENABLE_FTS5 - geopoly -DSQLITE_ENABLE_GEOPOLY - rtree -DSQLITE_ENABLE_RTREE - session -DSQLITE_ENABLE_SESSION + fts4 -DSQLITE_ENABLE_FTS4 + fts5 -DSQLITE_ENABLE_FTS5 + geopoly -DSQLITE_ENABLE_GEOPOLY + rtree -DSQLITE_ENABLE_RTREE + session {-DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK} + update-limit -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT } { if {[opt-bool $boolFlag]} { add-feature-flag $featureFlag - msg-result "Enabling $boolFlag" + msg-checking "Enabling " + } else { + msg-checking "Not enabling " } + msg-result "$boolFlag" +} + +msg-checking "Use #line macros in the amalgamation: " +if-enabled linemacros { + define AMALGAMATION_LINE_MACROS {--linemacros=1} + msg-result yes +} { + define AMALGAMATION_LINE_MACROS {--linemacros=0} + msg-result no } if {0} { @@ -961,7 +903,8 @@ if {"" ne [get-define OPT_FEATURE_FLAGS]} { msg-result "Final feature flags: [get-define OPT_FEATURE_FLAGS]" } -if {[opt-bool dump-defines]} { - msg-result "--dump-defines is creating file: $DUMP_DEFINES_FILE" - make-config-header $DUMP_DEFINES_FILE -bare OPT_FEATURE_FLAGS -auto {*} +if-enabled dump-defines { + global DUMP_DEFINES_FILE + msg-result "--dump-defines is creating file: $DUMP_DEFINES_FILE" + make-config-header $DUMP_DEFINES_FILE -bare OPT_FEATURE_FLAGS -auto {*} } diff --git a/manifest b/manifest index f9f8b35948..d251b6a143 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Correct\ssome\scopy/paste\serrors\sin\sthe\sprevious\scheckin. -D 2024-09-25T04:34:16.974 +C Disable\swith\s--enable-all\sbits,\sas\sthe\shelper\sfunction\sit\suses\sis\sdying\sfor\sreasons\sbeyond\smy\smeager\stcl-fu. +D 2024-09-25T06:07:54.339 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -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 6f4df7f8eda3c5e4268eece057dfb8174d0bef3ee187f0d4bc239d691f8ab543 +F auto.def b40b43d5a875219ce95e4f79e2af2e94dda6794499191be2f40bfee2c83f5a7e F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2232,8 +2232,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 0a49436c983848c3d88f3f5ec33fb9ac31cce62e94bf515ab1c357a10f5cd515 -R 56e31490266a3fa122787b87ec5fdcc3 +P 9752768d8a83052cb69fa07d51e2c82e710c20482cc02c33a4412ffdfa3dc699 +R 0eddc38894d4661d5c3724c85feb2c7f U stephan -Z 843bdfe8c3ebf9cba90f35ae570af0f3 +Z feae9d13f636f6426ad2f0979409e029 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1c5047e03d..f89887f041 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9752768d8a83052cb69fa07d51e2c82e710c20482cc02c33a4412ffdfa3dc699 +d2b883120e7ab374092d2bdef0faa22eaa9639cb103f9fbbbbfd16639fbfd323