From: stephan Date: Mon, 4 Nov 2024 03:43:07 +0000 (+0000) Subject: Minor doc correction and proj.tcl-internal API renaming. X-Git-Tag: major-relase~238 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb837474411b24494449eac43b696beab5beab5e;p=thirdparty%2Fsqlite.git Minor doc correction and proj.tcl-internal API renaming. FossilOrigin-Name: c8b24c590ef318e687ab76cd1a5d6c8fed84389e3ebbe544aa8b15759324958a --- diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index a1e77a482a..f82dcc3581 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -1096,7 +1096,7 @@ proc proj-redirect-autoconf-dir-vars {} { # trimmed copy of its contents, else it returns $dflt. The intended # usage is that things like developer-specific CFLAGS preferences can # be stored in .env-CFLAGS. -proc proj-default-flags {flag {dflt ""}} { +proc proj-env-file {flag {dflt ""}} { set fn ".env-${flag}" if {[file readable $fn]} { return [proj-file-content -trim $fn] @@ -1109,10 +1109,10 @@ proc proj-default-flags {flag {dflt ""}} { # the following places where it's defined: # # - Passed to configure as $var=... -# - A file named .env-$var (see [proj-default-flags]) # - Exists as an environment variable +# - A file named .env-$var (see [proj-env-file]) # # If none of those are set, $dflt is returned. proc proj-get-env {var {dflt ""}} { - return [get-env $var [proj-default-flags $var $dflt]] + return [get-env $var [proj-env-file $var $dflt]] } diff --git a/manifest b/manifest index 7d5859740b..ef4042732b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\sthe\s.default-CFLAGS\shandling\sinto\sa\sutility\sfunction,\srename\sthe\scorresponding\sfile\sto\s.env-VAR,\sand\sapply\sthat\slookup\sto\sa\scouple\smore\splaces. -D 2024-11-03T21:32:24.526 +C Minor\sdoc\scorrection\sand\sproj.tcl-internal\sAPI\srenaming. +D 2024-11-04T03:43:07.489 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md c5b4009dca54d127d2d6033c22fd9cc34f53bedb6ef12c7cbaa468381c74ab28 @@ -49,7 +49,7 @@ F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bd F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82 F autosetup/jimsh0.c 9860c2bd7825cb9d21616237e59a2dfa29acbd98c00da5f842e5abe222e69288 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 8f81f61b427b91b30983f0b2a9c169b453099ed4a209f526d0843df5ad1610e9 +F autosetup/proj.tcl ece0c56651493b63770f3553c04897e793eea0a63c6204563281796ed1204fb5 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb F autosetup/tmake.auto eaebc74ad538dfdd3c817c27eefc31930c20510c4f3a3704071f6cb0629ed71f F autosetup/tmake.tcl a275793ec1b6f8708179af0acef1f6f10d46c2920739743f7a8720c6d700c7a9 @@ -2198,8 +2198,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 a912c169152623f261fb5469a49f00aca1d8a273d8f7187744de12a26aede7cf -R a550a6f064acac325701eee77b42038f +P f01b61f21d105706e78eb1e3e7971e9ccb7a68250f8cda96ce285f0fd6b2f7f2 +R 74b038e8c09c34a894181c49cfb9529f U stephan -Z 180f9d1639b03db412606e42d092a67a +Z 17f517ee0d6e61152da25eb3ad04eb37 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 637b15dc31..728287e9cb 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f01b61f21d105706e78eb1e3e7971e9ccb7a68250f8cda96ce285f0fd6b2f7f2 +c8b24c590ef318e687ab76cd1a5d6c8fed84389e3ebbe544aa8b15759324958a