From: drh <drh@noemail.net>
Date: Tue, 11 Jan 2011 12:46:05 +0000 (+0000)
Subject: Fix the sqlite3.h generator script so that it generates the correct
X-Git-Tag: version-3.7.5~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbd91944dd7fca17d19afe43ee9e5e982bf58b3a;p=thirdparty%2Fsqlite.git

Fix the sqlite3.h generator script so that it generates the correct
SQLITE_SOURCE_ID string with the latest versions of Fossil that
include fractional seconds on the date/time stamp.

FossilOrigin-Name: 3513bf6ee090d9be97f60e12a4b39f4361ee17b7
---

diff --git a/install-sh b/install-sh
old mode 100644
new mode 100755
diff --git a/manifest b/manifest
index aeb632010c..310c1dfb95 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Update\spager\srequirements\sto\saccound\sfor\sthe\sZIPVFS\sextension.
-D 2011-01-10T21:01:10.514
+C Fix\sthe\ssqlite3.h\sgenerator\sscript\sso\sthat\sit\sgenerates\sthe\scorrect\nSQLITE_SOURCE_ID\sstring\swith\sthe\slatest\sversions\sof\sFossil\sthat\s\ninclude\sfractional\sseconds\son\sthe\sdate/time\sstamp.
+D 2011-01-11T12:46:05.980
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -100,7 +100,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 05d0f3475dd331896bd607cfb45c5e21b94589ad
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -592,7 +592,7 @@ F test/permutations.test c0ce0f3b741dd92a6d4c2671dbacba4b92dd81eb
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
-F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
+F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
 F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
 F test/quota.test ddafe133653093eb9a99ccd6264884ae43f9c9b8
@@ -873,10 +873,10 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/lemon.c dfd81a51b6e27e469ba21d01a75ddf092d429027
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
-F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
+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
@@ -898,14 +898,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 378a1d13af4a6f4cb2bfa65944b3b0d444b9f21c
-R 9ba476b75f53d677656fa985b1b64795
+P d94e59b514c16c5f7ea506e0af1c6e2ffecc13be
+R f02123c924a142fca1a394313d3028b5
 U drh
-Z b1419bbb0387a7a1916f12cb7cb5d1cc
+Z 6f6ef4dbc6a35c4d5adf4fad0076b217
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFNK3OZoxKgR168RlERAkacAKCMhl6ZxRLBUNTVdjwpBabO5xt6DACdFjqx
-fy4uPWEx1WyrV/pu6K1mVzM=
-=JPWF
+iD8DBQFNLFERoxKgR168RlERAifbAJsFaxIQF3cfejQ8x4UPtTJT8QRE3ACfSRFj
+QVjUad79/TL7jK/KM05BlxQ=
+=ebHi
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index e125cf8057..28ec38acbe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d94e59b514c16c5f7ea506e0af1c6e2ffecc13be
\ No newline at end of file
+3513bf6ee090d9be97f60e12a4b39f4361ee17b7
\ No newline at end of file
diff --git a/test/progress.test b/test/progress.test
old mode 100755
new mode 100644
diff --git a/tool/mkopts.tcl b/tool/mkopts.tcl
old mode 100755
new mode 100644
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
   }