From 095d399e7c611b09973ce1f936854cf00bfe0265 Mon Sep 17 00:00:00 2001 From: stephan Date: Sun, 20 Jul 2025 18:29:35 +0000 Subject: [PATCH] Ensure that certain local files are not inadvertently carried over into the snapshot tarball and causing confusing build results. FossilOrigin-Name: 47fdf7ed2cad7ec56118cf4f77297b1178cd2104a21b19d4afad46437a944378 --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/mkautoconfamal.sh | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index baab065a13..3c87f1c8ac 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Teach\sautoconf/tea/configure\sto\sbe\sable\sto\srun\sfrom\sthe\scanonical\ssource\stree\sso\sthat\sa\ssnapshot\sbuild\sor\sappropriate\ssymlinks\sare\snot\snecessary\sin\sorder\sto\stest\sthe\sextension. -D 2025-07-20T18:05:45.088 +C Ensure\sthat\scertain\slocal\sfiles\sare\snot\sinadvertently\scarried\sover\sinto\sthe\ssnapshot\starball\sand\scausing\sconfusing\sbuild\sresults. +D 2025-07-20T18:29:35.262 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -2157,7 +2157,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 564378ae48cc8f4c8c68ef6d00228a0b2a70e2e3e4c67f26be1dd05d9730fefd +F tool/mkautoconfamal.sh cf72166369d9d1df9df1ae9fcad03a7939808d7273784b56fd78b913587637a1 F tool/mkccode.tcl c42a8f8cf78f92e83795d5447460dbce7aaf78a3bbf9082f1507dc71a3665f3c x F tool/mkctimec.tcl 11c9eda4a8d18c74b79280b30506d832849fd1855e6d9e95e1fd506f1d211c37 x F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559 @@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P cbd46ab8a8b4622f42dd9f87f28b812c1d6fa5ea73a4e8f1253514455f397783 -R 52118a7ed2ddd135bf27484472b6e0f1 +P 71b9365b848d9b2bc75336ebbec815eba3a7ed5168798759753a990a1b706fc8 +R 92b878f9110115c0a116eb9ef0976c9a U stephan -Z 508393a0763d9277db13f96f52131a12 +Z c5f3fbd5079b89d562aee514bc8edf44 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9d97dec397..ee46df39fd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -71b9365b848d9b2bc75336ebbec815eba3a7ed5168798759753a990a1b706fc8 +47fdf7ed2cad7ec56118cf4f77297b1178cd2104a21b19d4afad46437a944378 diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh index b750593c98..2d7ea84e5f 100644 --- a/tool/mkautoconfamal.sh +++ b/tool/mkautoconfamal.sh @@ -62,10 +62,6 @@ cp $TOP/main.mk $TMPSPACE cd $TMPSPACE -# Clean up emacs-generated backup files from the target -rm -f ./autosetup/*~ ./autosetup/teaish/*~ -rm -f ./*~ - #if true; then # Clean up *~ files (emacs-generated backups). # This bit is only for use during development of @@ -83,8 +79,12 @@ cat < tea/generic/tclsqlite3.c EOF cat $TOP/src/tclsqlite.c >> tea/generic/tclsqlite3.c -find . -type f -name '*~' -exec rm -f \{} \; -find . -type f -name '#*#' -exec rm -f \{} \; +# Clean up some local remnants from the tarball. +rm -f tea/.env-* # autosetup environment overrides +find . -type f -name '*~' -exec rm -f \{} \; # backup files +find . -type f -name '#*#' -exec rm -f \{} \; # emacs lock files +find . -type f -name '*.o' -exec rm -f \{} \; +find . -type f -name '*.so' -exec rm -f \{} \; ./configure && make dist tar xzf sqlite-$VERSION.tar.gz -- 2.47.2