From: stephan Date: Thu, 7 Nov 2024 09:36:01 +0000 (+0000) Subject: Extend the list of "truthy" config values to include "true". Related doc updates. X-Git-Tag: major-relase~197 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4afb2fb2fc594840f14b1e9bd9bdbfa237be54a;p=thirdparty%2Fsqlite.git Extend the list of "truthy" config values to include "true". Related doc updates. FossilOrigin-Name: 4455718e485a31100ce3eb4ac5aeb7437c667d7994c6d2abfb38ad8bd1976d6e --- diff --git a/autosetup/README.md b/autosetup/README.md index c67709e0c5..016cf658de 100644 --- a/autosetup/README.md +++ b/autosetup/README.md @@ -68,9 +68,14 @@ In (mostly) alphabetical order: trimmed contents. This can be used, e.g., to set a developer's local preferences for the default `CFLAGS`. -- **`proj-define-if-opt-truthy flag defineName checkingMsg ?yesVal=1? ?noVal=0?`**\ - Defines `defineName` to either `yesVal` or `noVal`, depending on - whether `--flag` is truthy or not. +- **`proj-define-if-opt-truthy flag defineName ?checkingMsg? ?yesVal=1? ?noVal=0?`**\ + `[define $defineName]` to either `$yesVal` or `$noVal`, depending on + whether `--$flag` is truthy or not. `$checkingMsg` is a + human-readable description of the check being made, e.g. "enable foo + bar baz?" If no `checkingMsg` is provided, the operation is silent.\ + Potential TODO: change the final two args to `-yes` and `-no` + flags. They're rarely needed, though: search [auto.def][] for + `TSTRNNR_OPTS` for an example of where they are used. - **`proj-if-opt-truthy flag thenScript ?elseScript?`**\ Evals `thenScript` if the given `--flag` is truthy, else it @@ -84,18 +89,18 @@ In (mostly) alphabetical order: - **`proj-opt-truthy flag`**\ Returns 1 if `--flag`'s value is "truthy," i.e. one of (1, on, - enabled, yes). + enabled, yes, true). - **`proj-opt-was-provided FLAG`**\ Returns 1 if `--FLAG` was explicitly provided to configure, else 0. This distinction can be used to determine, e.g., whether `--with-readline` was provided or whether we're searching for readline by default. In the former case, failure to find it should - be treated as fatal. + be treated as fatal, where in the latter case it's not. - **`proj-val-truthy value`**\ - Returns 1 if `$value` is "truthy," i.e. one of (1, on, enabled, - yes). + Returns 1 if `$value` is "truthy," See `proj-opt-truthy` for the definition + of "truthy." - **`sqlite-add-feature-flag ?-shell? FLAG...`**\ Adds the given feature flag to the CFLAGS which are specific to building diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index 98ee998ebc..a1138a94ed 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -330,9 +330,9 @@ proc proj-opt-set {flag {val 1}} { # @proj-val-truthy val # # Returns 1 if $val appears to be a truthy value, else returns -# 0. Truthy values are any of {1 on enabled yes} +# 0. Truthy values are any of {1 on true yes enabled} proc proj-val-truthy {val} { - expr {$val in {1 on enabled yes}} + expr {$val in {1 on true yes enabled}} } ######################################################################## diff --git a/manifest b/manifest index 94016ad484..1dbba36489 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssome\sinternal\sdocs\sto\sauto.def\sexplaining\scertain\spassages. -D 2024-11-07T08:57:38.576 +C Extend\sthe\slist\sof\s"truthy"\sconfig\svalues\sto\sinclude\s"true".\sRelated\sdoc\supdates. +D 2024-11-07T09:36:01.761 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -37,7 +37,7 @@ F autoconf/tea/win/rules.vc 94a18c3e453535459b4a643983acca52fb8756e79055bd2ad4b0 F autoconf/tea/win/targets.vc 96a25a1fa6e9e9cfb348fd3760a5395b4ce8acafc8ed10f0412937ec200d5dbd F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e -F autosetup/README.md c2f4356d1ce44b44d7420c236afa548bf7a584a8a89b1eaa765b575232927896 +F autosetup/README.md 4c5ad38e4ff0a222efad63a81d2977dce46f3dd5393be48a8163f318a34fab25 F autosetup/autosetup 9416ffdcdd6e2dbf7f6d1e5c890078518930f8af7722a950eacc28c7f151d2d6 x F autosetup/autosetup-config.guess dfa101c5e8220e864d5e9c72a85e87110df60260d36cb951ad0a85d6d9eaa463 x F autosetup/autosetup-config.sub a38fb074d0dece01cf919e9fb534a26011608aa8fa606490864295328526cd73 x @@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82 F autosetup/jimsh0.c d40e381ea4526a067590e7b91bd4b2efa6d4980d286f908054c647b3df4aee14 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 2ee715f7fa7386879af0c651a22f9d451f980b8f2fed37d94f28b5b03cf5d703 +F autosetup/proj.tcl d4795a130eedb21d7f2acea0e28cf647e477b6e555817ac4497d62bbaf7b6c23 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9 @@ -2200,8 +2200,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f5b6604716826b2057e969a8c0d099325b22eac42f1da65ec367671fc6625639 -R e6f5780ae9a523afdaecc8222f6bc4aa +P 4749967e1b85675580eda2e92f4463c022e3ff929390a8f5b59f614f3975e158 +R 254ea4169e8fc19f66e402a223747df9 U stephan -Z ffd0c5323b1c2405e83633da2cf2458a +Z 47a15cd94d3d423b454caccbe768acf6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 46b7fa9517..8eb5d1a249 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4749967e1b85675580eda2e92f4463c022e3ff929390a8f5b59f614f3975e158 +4455718e485a31100ce3eb4ac5aeb7437c667d7994c6d2abfb38ad8bd1976d6e