From: stephan Date: Sat, 30 Nov 2024 17:48:31 +0000 (+0000) Subject: At the end of the configure script ensure that none of the files which are filtered... X-Git-Tag: major-relase~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d9c54bb20e2df6dbceaaff5f106b4679a8f0ef;p=thirdparty%2Fsqlite.git At the end of the configure script ensure that none of the files which are filtered for @VARS@ contain any unresolved @VAR@ placeholders, failing fatally if any do. FossilOrigin-Name: 301df5c2beb08e8e2944f7a9e46a10114603518385c05a9c30a838ab436369d4 --- diff --git a/auto.def b/auto.def index 9cea6a3dc1..c39dc55bc8 100644 --- a/auto.def +++ b/auto.def @@ -1400,3 +1400,26 @@ proj-if-opt-truthy dump-defines { undefine OPT_SHELL.list } } + +######################################################################## +# Perform some high-level validation on the generated files... +# +# 1) Ensure that no unresolved @VAR@ placeholders are in files which +# use those. +# +# 2) TBD +apply {{} { + # Check #1: ensure that files which get filtered for @VAR@ do not + # contain any unresolved @VAR@ refs. That may indicate an + # unexported/unused var or a typo. + foreach f "Makefile sqlite3.pc $::srcdir/tool/emcc.sh" { + if {![file exists $f]} continue + set lnno 1 + foreach line [proj-file-content-list $f] { + if {[regexp {(@[A-Za-z_]+@)} $line match]} { + error "Unresolved reference to $match at line $lnno of $f" + } + incr lnno + } + } +}} diff --git a/manifest b/manifest index 3061fed911..a6b58921cd 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\ssqlite_dbpage,\scancel\sany\spending\struncate\soperation\sif\sthere\san\serror\noccurs\slater\sin\sthe\stransaction. -D 2024-11-30T14:13:35.669 +C At\sthe\send\sof\sthe\sconfigure\sscript\sensure\sthat\snone\sof\sthe\sfiles\swhich\sare\sfiltered\sfor\s@VARS@\scontain\sany\sunresolved\s@VAR@\splaceholders,\sfailing\sfatally\sif\sany\sdo. +D 2024-11-30T17:48:31.521 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d @@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2 -F auto.def a82198f9ab1db4b54a5e134196bb0256d414789f747bbed6bacb67805c4bc0db +F auto.def a0e22c70e043c860dce809d436dad667c29981d9b98342b47e25747df08aaf28 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac @@ -2201,8 +2201,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 2220ccf4d6fea2413015c72fd318003b4b5afeae7cb7586b714fce36212d8c49 -R f154a3e6dd4944fdbd4f1ae39e54884f -U drh -Z a3278a97e32db442096a47b4ce1a54d9 +P 1abab10f85a4dba5ffe51a30eeef30853c120e5566ed97b3af1526fff597c647 +R e64febb3fe4e77d46b80ded354868cd5 +U stephan +Z c8dd07770a4ac68eb48e0cf5cc49ca34 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index b31bc4e555..559f3d7c89 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1abab10f85a4dba5ffe51a30eeef30853c120e5566ed97b3af1526fff597c647 +301df5c2beb08e8e2944f7a9e46a10114603518385c05a9c30a838ab436369d4