Refuse to build amalgamation-tarball and snapshot-tarball if the TEA version

number disagrees with ./VERSION.

FossilOrigin-Name: ad5cc3758b28bfc2370028695bde2615e7ebdbd26036de87031a04f5db22da5e

diff --git a/manifest b/manifest
index 3ed8f096e0e797dccbcdd842bc747d2f45f9c2ac..15b0d9e25cf770fc4cffbdff30ea5d1adb815c99 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sTEA\sversion\snumber\sto\sbe\s3.43.1
-D 2023-09-11T15:04:59.474
+C Refuse\sto\sbuild\samalgamation-tarball\sand\ssnapshot-tarball\sif\sthe\sTEA\sversion\nnumber\sdisagrees\swith\s./VERSION.
+D 2023-09-11T15:28:31.019
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2012,7 +2012,7 @@ F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c c34e5944318415de513d29a6098df247a9618c96d83c38d4abd88641fe46e669
 F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
-F tool/mkautoconfamal.sh f62353eb6c06ab264da027fd4507d09914433dbdcab9cb011cdc18016f1ab3b8
+F tool/mkautoconfamal.sh 7077151b62ecb2848c5b2d36cdbcd8caa0b58f2c12dcdac6e982da39d29d213c
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
 F tool/mkctimec.tcl aca4b83e49aecf10368cd5d11bc4847061041ade026db5bd8da17ef201f1403b x
 F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
@@ -2092,8 +2092,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2d3a40c05c49e1a49264912b1a05bc2143ac0e7c3df588276ce80a4cbc9bd1b0
-R f275f4f5c484836e8077e4ce69be007f
+P e00f1fedc9ec524a1b6fa5740865cd38828883f7bf53040e5826f69433ae1875
+Q +3308fdda4b81c110ba4a66d0b325e7653c2f8155e7864aeb78991ed1da061836
+R b3d934934cf1a54894c4513c51de1c6d
 U drh
-Z 47e5c706aee62efb2f08ec5dc87e6cde
+Z d832ab9a7bb185995f8b4f3599436d32
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2e3acd852a97440efd0851851cde5c8e31990026..5377e38023c46e30bbdf6027d6df855d416d583d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e00f1fedc9ec524a1b6fa5740865cd38828883f7bf53040e5826f69433ae1875
\ No newline at end of file
+ad5cc3758b28bfc2370028695bde2615e7ebdbd26036de87031a04f5db22da5e
\ No newline at end of file

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index eacd9fa515b4d46b85d0cf7af4873c3228fe7d7d..b7483189da42a7a039ba2396f92339463275ee87 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -25,6 +25,14 @@ VERSION=`cat $TOP/VERSION`
 HASH=`sed 's/^\(..........\).*/\1/' $TOP/manifest.uuid`
 DATETIME=`grep '^D' $TOP/manifest | sed -e 's/[^0-9]//g' -e 's/\(............\).*/\1/'`
 
+# Verify that the version number in the TEA autoconf file is correct.
+# Fail with an error if not.
+#
+if grep $VERSION autoconf/tea/configure.ac
+then echo "TEA version number ok"
+else echo "TEA version number mismatch.  Should be $VERSION"; exit 1
+fi
+
 # If this script is given an argument of --snapshot, then generate a
 # snapshot tarball named for the current checkout SHA1 hash, rather than
 # the version number.