Add EXTRA_SRC build var. If set, it is treated like a list of files, each of which...

FossilOrigin-Name: 934b84339860fa84a6faa3507bdd3cc58199e2636a394fc93176c80da0ba6f1c

diff --git a/Makefile.in b/Makefile.in
index e3bf1c0e7aa9ff1ca80418b2d88beec95cc5dc07..16ebf098c61b247fe2df088f37acb7d9b957e175 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -782,7 +782,8 @@ mptest:     mptester$(TEXE)
        touch .target_source
 
 sqlite3.c:     .target_source $(TOP)/tool/mksqlite3c.tcl src-verify
-       $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS)
+       $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS) \
+               $(EXTRA_SRC)
        cp tsrc/sqlite3ext.h .
        cp $(TOP)/ext/session/sqlite3session.h .
 
@@ -793,7 +794,8 @@ 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)
+       $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover \
+               $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
 
 sqlite3ext.h:  .target_source
        cp tsrc/sqlite3ext.h .

diff --git a/main.mk b/main.mk
index d8c372430e968fbeea8ccb8ba96248cf16f930f1..0efdec309c2dd2f3164f0dcfb427725615780c8f 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -230,7 +230,6 @@ SRC += \
 SRC += \
   $(TOP)/ext/misc/stmt.c
 
-
 # FTS5 things
 #
 FTS5_HDR = \
@@ -645,7 +644,7 @@ target_source:      $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c
        touch target_source
 
 sqlite3.c:     target_source $(TOP)/tool/mksqlite3c.tcl src-verify
-       tclsh $(TOP)/tool/mksqlite3c.tcl
+       tclsh $(TOP)/tool/mksqlite3c.tcl $(EXTRA_SRC)
        cp tsrc/sqlite3ext.h .
        cp $(TOP)/ext/session/sqlite3session.h .
        echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
@@ -657,7 +656,7 @@ sqlite3ext.h:       target_source
        cp tsrc/sqlite3ext.h .
 
 sqlite3.c-debug:       target_source $(TOP)/tool/mksqlite3c.tcl src-verify
-       tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros=1
+       tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros=1 $(EXTRA_SRC)
        echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
        cat sqlite3.c >>tclsqlite3.c
        echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c

diff --git a/manifest b/manifest
index 09646366edfe97caf4412a70d000ca0c684cb2e5..902e4aba7de01e4e6799560bb203bd11c1f64141 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Second\shalf\sof\s[1c532e80].
-D 2023-09-01T11:10:09.238
+C Add\sEXTRA_SRC\sbuild\svar.\sIf\sset,\sit\sis\streated\slike\sa\slist\sof\sfiles,\seach\sof\swhich\sgets\sappended\sverbatim\sto\ssqlite3.c.\sThe\sintent\sis\sto\senable\seasily\sextending\sthe\samalgamation.\sRequested\sin/around\s[forum:3fcc655f0ac0efe8|forum\spost\s3fcc655f0ac0efe8].
+D 2023-09-02T05:37:58.754
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 345a8599cf8ff015db534cedad7af70a1a6c36e295b85d720966c18af836ed30
+F Makefile.in c0ee78a772a33c1b377eb8f8b6f456ca10ad4aee86de4c9fcd16490e7432bcdb
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 26c2d196391a285c279adb10fd6001774d9b243af94b700b681e4a49cd476684
 F README.md 963d30019abf0cc06b263cd2824bce022893f3f93a531758f6f04ff2194a16a8
@@ -625,7 +625,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 5536159f62058714c972b5bd325c8d5ecd5c9b00b385dd2e1cbc17da70a711b2
+F main.mk 48632ee12ecb9157c8f662794051260933518b52c5b430c30c3852b6743a48bc
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2048,7 +2048,7 @@ F tool/mkshellc.tcl b7adf08b82de60811d2cb6af05ff59fc17e5cd6f3e98743c14eaaa3f8971
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl 49e39b1e616abc92fd8c24445f2b0a38881825f764541e0026f72371f0d84b65
+F tool/mksqlite3c.tcl 4f366e3d1ddb28996a6763c847fa62e1452bb11ca702841485df77823ec94ea4
 F tool/mksqlite3h.tcl d391cff7cad0a372ee1406faee9ccc7dad9cb80a0c95cae0f73d10dd26e06762
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@ -2115,8 +2115,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 1c532e807bf8466b67d9600ab9630a6736de77259e9a71ac435641715ee0e04b
-R ea796b2653d720202144fba261cf7ada
+P 8ca1d815a57be1fade59fb8ea5705c27b10294e4959c8a9c624f1623df6a5f63
+R 26961792cf57fe21537a8837bc1686c0
+T *branch * extra-src
+T *sym-extra-src *
+T -sym-trunk * Cancelled\sby\sbranch.
 U stephan
-Z 3f0f478ea9581db06db30ac4b45877cc
+Z 89876b5c6405dcc4d6d608637f43ad0e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2cefe103b63243fa723e49eaf3e8ec9137863400..f5b052c057bf47b658591796d2e17d0d8b063208 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ca1d815a57be1fade59fb8ea5705c27b10294e4959c8a9c624f1623df6a5f63
\ No newline at end of file
+934b84339860fa84a6faa3507bdd3cc58199e2636a394fc93176c80da0ba6f1c
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 6def8fa4474e682d075fc736f1e87add32262ccc..bdbc01e49684b2ff0e9f8798687956454b190966 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -17,7 +17,7 @@
 # After the "tsrc" directory has been created and populated, run
 # this script:
 #
-#      tclsh mksqlite3c.tcl
+#      tclsh mksqlite3c.tcl [flags] [extra source files]
 #
 # The amalgamated SQLite code will be written into sqlite3.c
 #
@@ -42,6 +42,7 @@ set linemacros 0
 set useapicall 0
 set enable_recover 0
 set srcdir tsrc
+set extrasrc [list]
 
 for {set i 0} {$i<[llength $argv]} {incr i} {
   set x [lindex $argv $i]
@@ -63,8 +64,10 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
   } elseif {[regexp {^-?-((help)|\?)$} $x]} {
     puts $help
     exit 0
-  } else {
+  } elseif {[regexp {^-?-} $x]} {
     error "unknown command-line option: $x"
+  } else {
+    lappend extrasrc $x
   }
 }
 set in [open $srcdir/sqlite3.h]
@@ -470,13 +473,16 @@ set flist {
    sqlite3session.c
    fts5.c
    stmt.c
-} 
+}
 if {$enable_recover} {
   lappend flist sqlite3recover.c dbdata.c
 }
 foreach file $flist {
   copy_file $srcdir/$file
 }
+foreach file $extrasrc {
+  copy_file $file
+}
 
 puts $out \
 "/* Return the source-id for this library */