From: stephan <stephan@noemail.net>
Date: Tue, 19 Nov 2024 19:16:58 +0000 (+0000)
Subject: Merge trunk into this branch. Fix a small jimtcl/tclsh regex incompatibility in mkcco... 
X-Git-Tag: major-relase~130^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3aaf963a97d3db7de6838fc74a4a70e6ab9c32c;p=thirdparty%2Fsqlite.git

Merge trunk into this branch. Fix a small jimtcl/tclsh regex incompatibility in mkccode.tcl.

FossilOrigin-Name: 7fb3ebfec634e0508267049fddb2b513201dbefce4d378ca3ec261c5d8336d7f
---

d3aaf963a97d3db7de6838fc74a4a70e6ab9c32c
diff --cc manifest
index e7c415ad2b,87bdfbdd5f..efd82a70ad
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Revert\slinking\sthe\sshell\sto\sthe\sdll\sfor\sreasons\sexplained\sin\snew\smakefile\scomments.\sMove\sthe\s--with-debug\sconfigure\sflag\sinto\sthe\sdeveloper\soptions\sset\sand\sadd\scommentary\sabout\swhy\sit\sshould\snever\sbe\sused\sfor\sproduction\sbuilds.
- D 2024-11-19T17:41:13.115
 -C Enhancements\sto\stool/mkccode.tcl\ssuch\sthat\sit\srecognizes\s-D\scommand\sline\narguments\sand\scan\suse\sthem\sin\sinternal\sIFDEF\sand\sIFNDEF\smacros.\s\sUpdate\nthe\stool/sqlite3_analyzer.c.in\sscript\ssuch\sthat\sit\somits\sthe\sSQLite\samalgamation\nif\s-DSQLITE_ENABLE_DBSTAT_VTAB\sis\sdefined.
 -D 2024-11-19T18:26:47.422
++C Merge\strunk\sinto\sthis\sbranch.\sFix\sa\ssmall\sjimtcl/tclsh\sregex\sincompatibility\sin\smkccode.tcl.
++D 2024-11-19T19:16:58.734
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2135,7 -2135,7 +2135,7 @@@ F tool/logest.c c34e5944318415de513d29a
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
  F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
  F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
- F tool/mkccode.tcl 4cb8ad7e7330aaed052b0657a1bfacbc67103c400e41860aff643a482cfc2d3e x
 -F tool/mkccode.tcl b0ddad168362ba6225c9372856ba0db90145734e882a9a5bb8951ef0d5bc6331 x
++F tool/mkccode.tcl 0e7488b7218128271b93a4b16e60a169097b6cb555446ce4d6a131be039bb536 x
  F tool/mkctimec.tcl ef6a67ec82e5b6fc19152a4c79f237227b18bf67ff16d155bac7adb94355d9cf x
  F tool/mkkeywordhash.c 6b0be901c47f9ad42215fc995eb2f4384ac49213b1fba395102ec3e999acf559
  F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
@@@ -2198,8 -2198,8 +2198,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9a17b83f859ef14629cb78d8c9af1b3f2493b0c8756bc2ebcf92f0872fb507c3
- R 0effbfea81177717d860b06a74ce79d8
 -P 4c4d1db00bd2c522165876dcf1606116a72525d9ffc891b266213704e25cde55
 -R cdb63603c9c3a16b29feb4bae93e8b25
 -U drh
 -Z 2a605008d2464811e071ed45a95c8ad5
++P 7b14309be42be4204c4d30e9741d56d75ab8ec34686791d032612337fe1c4dcf 7fec209290aa1a6dbbca8de154edaac5d8d0ce042bc0617d27fb2095c8d580f1
++R 0da2647f2e208e5fa5304d40f71239b4
 +U stephan
- Z aa386346708361b0b61a6d6560bd2986
++Z bed720f65fe4f336de4e69b585a4a039
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 2cf57950de,643a526325..d9f567ad70
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7b14309be42be4204c4d30e9741d56d75ab8ec34686791d032612337fe1c4dcf
 -7fec209290aa1a6dbbca8de154edaac5d8d0ce042bc0617d27fb2095c8d580f1
++7fb3ebfec634e0508267049fddb2b513201dbefce4d378ca3ec261c5d8336d7f
diff --cc tool/mkccode.tcl
index e847c8d3b8,457865b66f..b95f0c679d
--- a/tool/mkccode.tcl
+++ b/tool/mkccode.tcl
@@@ -37,11 -46,31 +46,31 @@@
  # top-level input file ("demoapp.c.in" in the example) is interpreted.
  # referenced files are copied verbatim.
  #
- if {[llength $argv]!=1} {
-   puts stderr "Usage: $argv0 TEMPLATE >OUTPUT"
+ proc usage {} {
+   puts stderr "Usage: $::argv0 \[OPTIONS\] TEMPLATE >OUTPUT"
    exit 1
  }
- set infile [lindex $argv 0]
+ set infile {}
+ foreach ax $argv {
+   if {[string match -D* $ax]} {
+     if {[string match *=* $ax]} {
 -      regexp {-D([^=]+)=(.*)} ax all name value
++      regexp -- {-D([^=]+)=(.*)} $ax all name value
+       set DEF($name) $value
+     } else {
+       set DEF([string range $ax 2 end]) 1
+     }
+     continue
+   }
+   if {[string match -* $ax]} {
+     puts stderr "$::argv0:  Unknown option \"$ax\""
+     usage
+   }
+   if {$infile!=""} {
+     puts stderr "$::argv0:  Surplus argument: \"$ax\""
+     usage
+   }
+   set infile $ax
+ }
  set ROOT [file normalize [file dir $argv0]/..]
  set HOME [file normalize [file dir $infile]]
  set in [open $infile rb]