Automate update of the library version number in autoconf/tea/configure.ac as part...

FossilOrigin-Name: d5c0be36fca18e15938ce9dc9c13bf79497d013623de85e23bb18e0940b56eba

diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
index 65108ee5d0966734d50bac65fa0f57d1b1db2fbb..d7cc0e946f72d4f060cadd6e8680c3ca9d7ebb1e 100644 (file)
--- a/autoconf/Makefile.in
+++ b/autoconf/Makefile.in
@@ -249,6 +249,7 @@ dist:
        rm -fr $(dist_name)
        mkdir -p $(dist_name)
        cp -rp $(DIST_FILES) $(dist_name)/.
+       rm -f $(dist_name)/tea/configure.ac.in
        tar czf $(dist_tarball) $(dist_name)
        rm -fr $(dist_name)
        ls -l $(dist_tarball)

diff --git a/autoconf/tea/configure.ac b/autoconf/tea/configure.ac.in
similarity index 99%
rename from autoconf/tea/configure.ac
rename to autoconf/tea/configure.ac.in
index 963488561935c8e36764b321665152c6433f8ac4..a13a1e76152ccc1fc31b102c7299e5950a09cf2c 100644 (file)
--- a/autoconf/tea/configure.ac
+++ b/autoconf/tea/configure.ac.in
@@ -19,7 +19,7 @@ dnl   to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([sqlite],[3.49.1])
+AC_INIT([sqlite],[@VERSION@])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

diff --git a/manifest b/manifest
index 0c15714bd3c7c8a894d16e36fc744be6a19eb06d..cfd4f154533dd4b5473edcdbbb1742b94a9a28ce 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C DLL\sinstallation\srules\sno\slonger\screate\sversioned\ssymlinks\son\splatforms\swhere\sthe\sDLL\sextension\sis\s'.dll'\s(cygwin,\smsys2,\setc.),\sas\ssuggested\sin\s[forum:28bb79638844c328|forum\spost\s28bb79638844c328].
-D 2025-02-15T16:24:52.713
+C Automate\supdate\sof\sthe\slibrary\sversion\snumber\sin\sautoconf/tea/configure.ac\sas\spart\sof\sthe\stool/mkautoconfamal.sh\sprocess.
+D 2025-02-15T16:29:34.654
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -16,7 +16,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
 F auto.def eddf6aef976e2c1a56c0accc3244945e0b22ec6799074c40be160e5a9a5662b0
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
-F autoconf/Makefile.in 40106236dd97053cbeed7f47880375fb402c89f6dc7b8effe363c791f8ef3ca3
+F autoconf/Makefile.in 5e5ab43450b27e7247a0066f0606c5471e72f935c59ac3ba40038e23ebce92d5
 F autoconf/Makefile.msc 0a071367537dc395285a5d624ac4f99f3a387b27cc5e89752423c0499e15aec4
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
@@ -24,7 +24,7 @@ F autoconf/auto.def 9af634c6d51fa4b82c9bb61b51249ca087f2cbe09c7c3c31f920759082a1
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
-F autoconf/tea/configure.ac 2bc49c8aabc4f26e7ba5fc15ff95b7a5aa789156aa6ccb045bb0d20c2898b30a
+F autoconf/tea/configure.ac.in da18360dfdeac7414fa8deb549f3d65aeca0ae1150ff1a8b902019b39ce019a4 w autoconf/tea/configure.ac
 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in 55aec3c6d7e9a1de9b8d2fdc9c27fd055da3ac3a51b572195e2ae7300bcfd3a2
@@ -2144,7 +2144,7 @@ F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkamalzip.tcl 8aa5ebe7973c8b8774062d34e15fea9815c4cc2ceea3a9b184695f005910876a
-F tool/mkautoconfamal.sh 14d2144043c6455958012f92324f4ce7c90a261b5daa2f2c7509498468475f8d
+F tool/mkautoconfamal.sh c5e65fa1c922f2e3b3e4f6cd0331ec7d84bdef085f32cb1c46673cdf95ec8090
 F tool/mkccode.tcl 210159febe0ef0ecbc53c79833500663ceaba0115b2b374405818dc835b5f84b x
 F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x
 F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
@@ -2209,9 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 467804412230450c63ec47e8f903e58dce971a4752c242c3fa6b1249e535d2ac
-Q +d743410665df8ba962db6e1f245d929b005d0add77be95af3c3c7f87a1c758fb
-R 0f8ef3938c3ebaf76f4692ee90d5a839
+P d94ad545776ad5cdbd637c1532e0be5f0364eee31484ede97ec4173b2b76f781
+Q +be265559a334eda127862ae54edb58c46051f74445642daa84a9f61a81df1bac
+R f1c8af34474d855ed833c09071537ab5
 U stephan
-Z d230e95005f5cf3684b9f3a7df0fb526
+Z e1b72fd3cfe1b362bcc00fb0b0492941
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index ef16286767896d3673940a9592f222fdcb2cff9a..9dc5501f9a6033f480f3060f4d8fb400926253e8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d94ad545776ad5cdbd637c1532e0be5f0364eee31484ede97ec4173b2b76f781
+d5c0be36fca18e15938ce9dc9c13bf79497d013623de85e23bb18e0940b56eba

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index c26ca47bf11bf1736e8af21c18609172a7ce95a3..c26ac8c73cd477a5aec1e1d84337dde35a81a008 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -25,10 +25,14 @@ VERSION=`cat $TOP/VERSION`
 HASH=`cut -c1-10 $TOP/manifest.uuid`
 DATETIME=`grep '^D' $TOP/manifest | tr -c -d '[0-9]' | cut -c1-12`
 
-# Verify that the version number in the TEA autoconf file is correct.
-# Fail with an error if not.
+# Inject the current version into the TEA autoconf file.
 #
-if grep $VERSION $TOP/autoconf/tea/configure.ac
+sed -e "s/@VERSION@/$VERSION/" \
+    < $TOP/autoconf/tea/configure.ac.in \
+    > $TOP/autoconf/tea/configure.ac
+# And then verify that that worked...
+#
+if grep $VERSION $TOP/autoconf/tea/configure.ac > /dev/null
 then echo "TEA version number ok"
 else echo "TEA version number mismatch.  Should be $VERSION"; exit 1
 fi
@@ -91,10 +95,8 @@ cat <<EOF > tea/generic/tclsqlite3.c
 EOF
 cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c
 
-sed "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$VERSION])/" tea/configure.ac > tmp
-mv tmp tea/configure.ac
-
 cd tea
+rm -f configure.ac.in
 autoconf
 rm -rf autom4te.cache