Add Makefile.in targets for sqlite3r.c and sqlite3r.h, versions of the amalgamation...

FossilOrigin-Name: 59a837cfc7f9f96509491c8fc45355d2e8892af25246955e22adec1cbf37327b

diff --git a/Makefile.in b/Makefile.in
index 09e75bb882f525b316165f752770db8dc1bc353b..0a09e999f8b516d295c9abb30d455bb39533ebf4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -778,6 +778,15 @@ sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
        cp tsrc/sqlite3ext.h .
        cp $(TOP)/ext/session/sqlite3session.h .
 
+sqlite3r.h: sqlite3.h
+       $(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h
+
+sqlite3r.c: sqlite3.c sqlite3r.h
+       cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
+       cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
+       cp $(TOP)/ext/recover/dbdata.c tsrc/
+       $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS)
+
 sqlite3ext.h:  .target_source
        cp tsrc/sqlite3ext.h .
 

diff --git a/manifest b/manifest
index 4cd29a45bd0c3f73ba58fe8526c9a9cfc698ae96..b6d1cb051390827725439e856fba3cf6156e876f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Small\sperformance\simprovement\sin\ssqlite3BtreeTransferRow().
-D 2022-11-21T13:35:00.374
+C Add\sMakefile.in\stargets\sfor\ssqlite3r.c\sand\ssqlite3r.h,\sversions\sof\sthe\samalgamation\sthat\sinclude\sthe\srecover\sextension.
+D 2022-11-22T16:12:53.393
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 78e4c4916f2c3993a8a454018745ff02094a8029d449d0c22db98f1cf8260420
+F Makefile.in 9a1228fd6406cc607958ccf1386a9a8f74f8255a7e98bc9c0a2792b56bd3a309
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
 F Makefile.msc e7a564ceec71f0d9666031d5638cf0d4f88b050b44e8df5d32125137cd259ac0
 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e
@@ -642,7 +642,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
-F src/shell.c.in 16740a86346ba9823f92528ec588f2b74f68166dac965dabd19883ace230f11d
+F src/shell.c.in 947c5714ae9b15a41bc69421ed33f642ed438d09536d0eeecd8964cc05d740ce
 F src/sqlite.h.in 100fc660c2f19961b8ed8437b9d53d687de2f8eb2b96437ec6da216adcb643ca
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -1995,8 +1995,8 @@ F tool/mkshellc.tcl 02d0de8349ef830c0fb20d29680320bde2466e2ec422e5bd94c4317a7a7e
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl 4fc26a9bfa0c4505b203d7ca0cf086e75ebcd4d63eb719c82f37e3fecdf23d37
-F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
+F tool/mksqlite3c.tcl eb47021591b1ad4a6862e2cb5625f1ac67ec1e0c6db5ba3953c069c635284cf5
+F tool/mksqlite3h.tcl d391cff7cad0a372ee1406faee9ccc7dad9cb80a0c95cae0f73d10dd26e06762
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
 F tool/offsets.c 8ed2b344d33f06e71366a9b93ccedaa38c096cc1dbd4c3c26ad08c6115285845
@@ -2059,8 +2059,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 07182dca9f2a4ffea1af0684c93e55e105465b2ee9820c70764e3e7bc1c28efc
-R 06d7ab66cd3f5a521e55d8df4889b401
-U drh
-Z a6fa3008dc4759fddba2bf18530ff99d
+P dab959ea3edf99788bfd76352cd46a3e56876b0e7d7008c6927aa14534853c50
+R 1ce5997170cf4e38f2813ab1d1191f64
+T *branch * make-sqlite3r.c
+T *sym-make-sqlite3r.c *
+T -sym-trunk *
+U dan
+Z c67d4c65fcd4c164d590b57cc9ec79e4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e7e8aac79fc25ced7aaf0eb26a482c486818e2bd..5f09b562a65800aca7922c53c72db4616435f2e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dab959ea3edf99788bfd76352cd46a3e56876b0e7d7008c6927aa14534853c50
\ No newline at end of file
+59a837cfc7f9f96509491c8fc45355d2e8892af25246955e22adec1cbf37327b
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index db8d987660353e3f1195ab975d49a751bcc88ad4..29e61c7b16a0f2f3a86740b79da2a6d0d6732397 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1066,9 +1066,11 @@ INCLUDE ../ext/expert/sqlite3expert.c
 #define SQLITE_SHELL_HAVE_RECOVER 0
 #endif
 #if SQLITE_SHELL_HAVE_RECOVER
-INCLUDE ../ext/recover/dbdata.c
 INCLUDE ../ext/recover/sqlite3recover.h
+# ifndef SQLITE_HAVE_SQLITE3R
+INCLUDE ../ext/recover/dbdata.c
 INCLUDE ../ext/recover/sqlite3recover.c
+# endif
 #endif
 
 #if defined(SQLITE_ENABLE_SESSION)

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 0cdf514e44190198512e5b4213aa3a31bffc252a..bc1aadd194c8e4629e9e6d97f80491f5a42a4f8d 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -40,11 +40,14 @@ set help {Usage: tclsh mksqlite3c.tcl <options>
 set addstatic 1
 set linemacros 0
 set useapicall 0
+set enable_recover 0
 set srcdir tsrc
 
 for {set i 0} {$i<[llength $argv]} {incr i} {
   set x [lindex $argv $i]
-  if {[regexp {^-?-nostatic$} $x]} {
+  if {[regexp {^-?-enable-recover$} $x]} {
+    set enable_recover 1
+  } elseif {[regexp {^-?-nostatic$} $x]} {
     set addstatic 0
   } elseif {[regexp {^-?-linemacros(?:=([01]))?$} $x ma ulm]} {
     if {$ulm == ""} {set ulm 1}
@@ -78,7 +81,9 @@ close $in
 # Open the output file and write a header comment at the beginning
 # of the file.
 #
-set out [open sqlite3.c w]
+set fname sqlite3.c
+if {$enable_recover} { set fname sqlite3r.c }
+set out [open $fname w]
 # Force the output to use unix line endings, even on Windows.
 fconfigure $out -translation lf
 set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1]
@@ -162,6 +167,7 @@ foreach hdr {
    vxworks.h
    wal.h
    whereInt.h
+   sqlite3recover.h
 } {
   set available_hdr($hdr) 1
 }
@@ -325,7 +331,7 @@ proc copy_file {filename} {
 # used subroutines first in order to help the compiler find
 # inlining opportunities.
 #
-foreach file {
+set flist {
    sqliteInt.h
    os_common.h
    ctime.c
@@ -441,7 +447,11 @@ foreach file {
    sqlite3session.c
    fts5.c
    stmt.c
-} {
+} 
+if {$enable_recover} {
+  lappend flist sqlite3recover.c dbdata.c
+}
+foreach file $flist {
   copy_file $srcdir/$file
 }
 

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index 9078a157535509e6c43bd7a859bf1ae21b1b170a..bd579c28b0ee7df128adcc012ae7cd43f7891d97 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -40,9 +40,16 @@ set TOP [lindex $argv 0]
 #
 set useapicall 0
 
+# Include sqlite3recover.h?
+#
+set enable_recover 0
+
 if {[lsearch -regexp [lrange $argv 1 end] {^-+useapicall}] != -1} {
   set useapicall 1
 }
+if {[lsearch -regexp [lrange $argv 1 end] {^-+enable-recover}] != -1} {
+  set enable_recover 1
+}
 
 # Get the SQLite version number (ex: 3.6.18) from the $TOP/VERSION file.
 #
@@ -84,6 +91,9 @@ set filelist [subst {
   $TOP/ext/session/sqlite3session.h
   $TOP/ext/fts5/fts5.h
 }]
+if {$enable_recover} {
+  lappend filelist "$TOP/ext/recover/sqlite3recover.h"
+}
 
 # These are the functions that accept a variable number of arguments.  They
 # always need to use the "cdecl" calling convention even when another calling