From: drh <drh@noemail.net>
Date: Sat, 2 Oct 2010 01:00:02 +0000 (+0000)
Subject: Fix the amalgamation builder so that it works with the rtree updates of
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbranch-3.6.23;p=thirdparty%2Fsqlite.git

Fix the amalgamation builder so that it works with the rtree updates of
the prior check-in.

FossilOrigin-Name: 265b0b29b83fde813c63f401b979e619f2b12d5d
---

diff --git a/manifest b/manifest
index 6aab2d60a2..7d96b66a15 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Backport\sthe\sRTree\simplementation\sfrom\sthe\strunk\sinto\sthe\s3.6.23\sbranch.\nThe\scode\sfor\sthe\sapplication-defined\squery\sboxes\sis\sstill\spresent\sbut\nis\sdisabled.\s\sThe\sreason\sfor\sthis\sbackport\sis\sto\stake\sadvantage\sof\srecent\nenhancements\sto\srobustness\sto\sdatabase\scorruption.
-D 2010-10-01T20:45:09
+C Fix\sthe\samalgamation\sbuilder\sso\sthat\sit\sworks\swith\sthe\srtree\supdates\sof\nthe\sprior\scheck-in.
+D 2010-10-02T01:00:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -778,7 +778,7 @@ F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl 4c6924c7e877defa8f9a12ef1e6867de614acf3f
-F tool/mksqlite3h.tcl eb100dce83f24b501b325b340f8b5eb8e5106b3b
+F tool/mksqlite3h.tcl 03b6ca938c833814923674d8a160e91fcedb4571
 F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
 F tool/omittest.tcl 27d6f6e3b1e95aeb26a1c140e6eb57771c6d794a
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -797,14 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P bcbdecd854d8430831fbcdf17f55ba6f55ba745b
-R ed7d943ea79f2ad1318560d1daa66320
+P 854b23c117c973fcf63f31bda189b7492595c3f9
+R 44ce2c8db78990178170a00bb13c2135
 U drh
-Z 659a01ac61f1d1da586b568cc38f9a63
+Z d5d5118c96e9b45f879181547395d273
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMpkhYoxKgR168RlERAiBmAKCGig8IZL1z13drMFDhRpUUIKlI0QCdH0zm
-xPGZQs3j3mKcg06Zyv/kZt4=
-=3Awd
+iD8DBQFMpoQVoxKgR168RlERAlXzAJ4j7kbq+jS8F3BG5yE4X+/sy7ytuQCfRQ88
+PtOzqfzm+39Njura333YmpA=
+=lHk9
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 6acc6286cc..bdb80b9e9f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-854b23c117c973fcf63f31bda189b7492595c3f9
\ No newline at end of file
+265b0b29b83fde813c63f401b979e619f2b12d5d
\ No newline at end of file
diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 58fe8a8905..88dc8df807 100644
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -65,32 +65,39 @@ close $in
 set varpattern {^[a-zA-Z][a-zA-Z_0-9 *]+sqlite3_[_a-zA-Z0-9]+(\[|;| =)}
 set declpattern {^ *[a-zA-Z][a-zA-Z_0-9 ]+ \**sqlite3_[_a-zA-Z0-9]+\(}
 
-# Process the  src/sqlite.h.in  file.
+# Process the src/sqlite.h.in ext/rtree/sqlite3rtree.h files.
 #
-set in [open $TOP/src/sqlite.h.in]
-while {![eof $in]} {
-
-  set line [gets $in]
-
-  regsub -- --VERS--           $line $zVersion line
-  regsub -- --VERSION-NUMBER-- $line $nVersion line
-  regsub -- --SOURCE-ID--      $line "$zDate $zUuid" line
+foreach file [list $TOP/src/sqlite.h.in $TOP/ext/rtree/sqlite3rtree.h] {
+  set in [open $file]
+  while {![eof $in]} {
+  
+    set line [gets $in]
 
-  if {[regexp {define SQLITE_EXTERN extern} $line]} {
+    # File sqlite3rtree.h contains a line "#include <sqlite3.h>". Omit this
+    # line when copying sqlite3rtree.h into sqlite3.h.
+    #
+    if {[string match {*#include*<sqlite3.h>*} $line]} continue
+  
+    regsub -- --VERS--           $line $zVersion line
+    regsub -- --VERSION-NUMBER-- $line $nVersion line
+    regsub -- --SOURCE-ID--      $line "$zDate $zUuid" line
+  
+    if {[regexp {define SQLITE_EXTERN extern} $line]} {
+      puts $line
+      puts [gets $in]
+      puts ""
+      puts "#ifndef SQLITE_API"
+      puts "# define SQLITE_API"
+      puts "#endif"
+      set line ""
+    }
+  
+    if {([regexp $varpattern $line] && ![regexp {^ *typedef} $line])
+     || ([regexp $declpattern $line])
+    } {
+      set line "SQLITE_API $line"
+    }
     puts $line
-    puts [gets $in]
-    puts ""
-    puts "#ifndef SQLITE_API"
-    puts "# define SQLITE_API"
-    puts "#endif"
-    set line ""
   }
-
-  if {([regexp $varpattern $line] && ![regexp {^ *typedef} $line])
-   || ([regexp $declpattern $line])
-  } {
-    set line "SQLITE_API $line"
-  }
-  puts $line
+  close $in
 }
-close $in