Adding an option to specify a version of sqlite3 to build and use to update

the results databases (default latest, which was the version used before).
Also adding an option to pass a mirror directory to not-fork. Updating
documentation.

FossilOrigin-Name: aacad5c1a91244feb6b30b4ad883c0ef201983add3516b782fd065ca8050fd1f

Author: Uilebheist

Makefile

@@ -69,9 +69,9 @@ test: Makefile.options $(TEST_DATABASE_NAME)
 
 database: $(DATABASE_NAME)
 $(DATABASE_NAME):
-	$(TCL) tool/build.tcl database not-fork.d $(BUILD_DIR) $(DATABASE_NAME)
+	$(TCL) tool/build.tcl database not-fork.d $(BUILD_DIR) $(DATABASE_NAME) $(BUILD_OPTIONS)
 $(TEST_DATABASE_NAME):
-	$(TCL) tool/build.tcl database not-fork.d $(BUILD_DIR) $(TEST_DATABASE_NAME)
+	$(TCL) tool/build.tcl database not-fork.d $(BUILD_DIR) $(TEST_DATABASE_NAME) $(BUILD_OPTIONS)
 
 # show what targets would be built, useful to test combinations of command-line
 # options

doc/lumo-build-benchmark.md

@@ -318,6 +318,9 @@ targets specified; the targets are specified using the same syntax as
 `TARGETS` described below, with run-time options ignored (build-time
 options will be respected).  This is mainly used by some compatibility
 tests to make sure a version with some special options is also built.
+* `SQLITE_FOR_DB=version` - sqlite3 version to build and use to
+update results databases; if this option is not provided, it defaults
+to `latest`
 * `BENCHMARK_RUNS=number` - how many times to repeat each benchmark, default 1.
 
 Options which take a list of versions expect a space-separated list (this
@@ -376,6 +379,8 @@ to the not-forking tool; this could be necessary if the defaults have been
 set to `--offline` and the operation cannot be completed with cached data.
 * `CACHE_DIR=path` (default: `$HOME/.cache/LumoSQL/not-fork`), the directory
 where not-forking will cache its downloads
+* `NOTFORK_MIRROR=dir` pass `--local-mirror=dir` to `not-fork`, to use
+locally-stored sources where possible
 
 To help debugging, some options provide a mechanism to copy intermediate
 files, as well as the SQL statement used:

tool/build.tcl

@@ -83,8 +83,8 @@ if {$operation eq "options"} {
     puts $outf ""
     set prn 1
 } elseif {$operation eq "database"} {
-    if {[llength $argv] != 4} {
-	puts stderr "Usage: build.tcl database NOTFORK_CONFIG BUILD_DIR DATABASE_NAME"
+    if {[llength $argv] < 4} {
+	puts stderr "Usage: build.tcl database NOTFORK_CONFIG BUILD_DIR DATABASE_NAME BUILD_OPTIONS..."
 	exit 1
     }
     set build_dir [lindex $argv 2]
@@ -299,8 +299,10 @@ array set other_values [list \
 	LUMO_TEST_DIR    "" \
 	MAKE_COMMAND     "make" \
 	NOTFORK_COMMAND  "not-fork" \
+	NOTFORK_MIRROR   "" \
 	NOTFORK_ONLINE   0 \
 	NOTFORK_UPDATE   0 \
+	SQLITE_FOR_DB    "" \
 	SQLITE_VERSIONS  [join $sqlite3_versions] \
 	USE_SQLITE       "yes" \
 ]
@@ -491,6 +493,9 @@ proc notfork_command {target args} {
     if {$other_values(NOTFORK_ONLINE)} {
 	lappend rargs "--online"
     }
+    if {$other_values(NOTFORK_MIRROR) ne ""} {
+	lappend rargs $other_values(NOTFORK_MIRROR) "--local-mirror"
+    }
     if {$other_values(CACHE_DIR) ne ""} {
 	lappend rargs $other_values(CACHE_DIR) "--cache"
     }
@@ -568,8 +573,12 @@ if {$operation ne "what" && $operation ne "targets"} {
     set build_dir [file normalize $build_dir]
 }
 
-versions_list sqlite3_for_db sqlite3 latest ""
-set sqlite3_for_db [lindex $sqlite3_for_db 0]
+if {$other_values(SQLITE_FOR_DB) eq ""} {
+    versions_list sqlite3_for_db sqlite3 latest ""
+    set sqlite3_for_db [lindex $sqlite3_for_db 0]
+} else {
+    set sqlite3_for_db $other_values(SQLITE_FOR_DB)
+}
 set target_string $other_values(TARGETS)
 set benchmark_list [list]
 set build_list [list $sqlite3_for_db]