From: drh <drh@noemail.net>
Date: Sun, 20 Feb 2011 03:22:51 +0000 (+0000)
Subject: Backport the sqlite3.h generator fix so that it works with newer versions
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd541f2a1352e75ceddc727a979f3922fa12e3e6;p=thirdparty%2Fsqlite.git

Backport the sqlite3.h generator fix so that it works with newer versions
of Fossil.  See [3513bf6ee090d9b] for the original.

FossilOrigin-Name: 29597a71d0848cd5faeb68b606a9127910c8dc57
---

diff --git a/manifest b/manifest
index 80ecfcdd97..4b19f09aea 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Backport\sthe\schanges\sof\scheckin\s[cf86affcb7d308949]\n("Make\swal_checkpoint\sa\sno-op\sif\sa\sprior\scheckpoint\shas\salready\scopied\nall\sWAL\scontent\sinto\sthe\sdatabase.")\sto\sthe\s3.7.4\srelease.
-D 2011-02-20T03:20:03.287
+C Backport\sthe\ssqlite3.h\sgenerator\sfix\sso\sthat\sit\sworks\swith\snewer\sversions\nof\sFossil.\s\sSee\s[3513bf6ee090d9b]\sfor\sthe\soriginal.
+D 2011-02-20T03:22:51.510
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -875,7 +875,7 @@ F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl e0db70c2c52b0e3d0867ca931229e5b90ffe7837
-F tool/mksqlite3h.tcl 03b6ca938c833814923674d8a160e91fcedb4571
+F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -897,14 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P bcc22c4b800e1f5b5619193890548d2a6bc19280
-R 915f17568a7a0869f65f9007c0278ea5
+P e6e540ab7779f5363bf0c93a9e1482b0f31782ce
+R fe1521f9ffa5f711895347a15e320bc3
 U drh
-Z 63e4626d3314741f01416949756e845c
+Z 7b3d563c815de0818c91d3314970b550
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNYIhmoxKgR168RlERArCeAJ9FTRQ1SHnENPOnuvjikmczocV0DQCfW8WH
-6llbqcmLE2Gou9q+3HfSJrk=
-=FYeT
+iD8DBQFNYIkOoxKgR168RlERAnuqAJ9SnzN8KWSap9MM0SrErbejIcEESQCfWvKk
+tS4dB1/H9sl4h03cKtPMKGk=
+=EK/3
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 9840954282..055cab8199 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6e540ab7779f5363bf0c93a9e1482b0f31782ce
\ No newline at end of file
+29597a71d0848cd5faeb68b606a9127910c8dc57
\ No newline at end of file
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 88dc8df807..554069c323 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -53,7 +53,7 @@ set in [open $TOP/manifest]
 set zDate {}
 while {![eof $in]} {
   set line [gets $in]
-  if {[regexp {^D (2.*[0-9])} $line all date]} {
+  if {[regexp {^D (2[-0-9T:]+)} $line all date]} {
     set zDate [string map {T { }} $date]
     break
   }