Fossil SCM
Mention the ./configure --print-minimum-sqlite-version feature in the change log. Improved comments on the two places in the code that check the minimum SQLite version, so that they refer to one another, to remind developers to change both places if they change either.
Commit
7018d7c158f425cbd42acb6a5eaa3365ddfd872e3c57caa5dbf63f8d6c6cf817
Parent
c561e051eb3b487…
3 files changed
+3
-1
+5
+6
M
auto.def
+3
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -29,11 +29,13 @@ | ||
| 29 | 29 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 30 | 30 | no-opt=0 => {Build without optimization} |
| 31 | 31 | json=0 => {Build with fossil JSON API enabled} |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -# Update the minimum required SQLite version number here. | |
| 34 | +# Update the minimum required SQLite version number here, and also | |
| 35 | +# in src/main.c near the sqlite3_libversion_number() call. Take care | |
| 36 | +# that both places agree! | |
| 35 | 37 | define MINIMUM_SQLITE_VERSION "3.35.0" |
| 36 | 38 | |
| 37 | 39 | # This is useful for people wanting Fossil to use an external SQLite library |
| 38 | 40 | # to compare the one they have against the minimum required |
| 39 | 41 | if {[opt-bool print-minimum-sqlite-version]} { |
| 40 | 42 |
| --- auto.def | |
| +++ auto.def | |
| @@ -29,11 +29,13 @@ | |
| 29 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 30 | no-opt=0 => {Build without optimization} |
| 31 | json=0 => {Build with fossil JSON API enabled} |
| 32 | } |
| 33 | |
| 34 | # Update the minimum required SQLite version number here. |
| 35 | define MINIMUM_SQLITE_VERSION "3.35.0" |
| 36 | |
| 37 | # This is useful for people wanting Fossil to use an external SQLite library |
| 38 | # to compare the one they have against the minimum required |
| 39 | if {[opt-bool print-minimum-sqlite-version]} { |
| 40 |
| --- auto.def | |
| +++ auto.def | |
| @@ -29,11 +29,13 @@ | |
| 29 | fossil-debug=0 => {Build with fossil debugging enabled} |
| 30 | no-opt=0 => {Build without optimization} |
| 31 | json=0 => {Build with fossil JSON API enabled} |
| 32 | } |
| 33 | |
| 34 | # Update the minimum required SQLite version number here, and also |
| 35 | # in src/main.c near the sqlite3_libversion_number() call. Take care |
| 36 | # that both places agree! |
| 37 | define MINIMUM_SQLITE_VERSION "3.35.0" |
| 38 | |
| 39 | # This is useful for people wanting Fossil to use an external SQLite library |
| 40 | # to compare the one they have against the minimum required |
| 41 | if {[opt-bool print-minimum-sqlite-version]} { |
| 42 |
+5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -679,14 +679,19 @@ | ||
| 679 | 679 | } |
| 680 | 680 | #endif |
| 681 | 681 | |
| 682 | 682 | fossil_printf_selfcheck(); |
| 683 | 683 | fossil_limit_memory(1); |
| 684 | + | |
| 685 | + /* When updating the minimum SQLite version, change the number here, | |
| 686 | + ** and also MINIMUM_SQLITE_VERSION value set in ../auto.def. Take | |
| 687 | + ** care that both places agree! */ | |
| 684 | 688 | if( sqlite3_libversion_number()<3035000 ){ |
| 685 | 689 | fossil_panic("Unsuitable SQLite version %s, must be at least 3.35.0", |
| 686 | 690 | sqlite3_libversion()); |
| 687 | 691 | } |
| 692 | + | |
| 688 | 693 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 689 | 694 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 690 | 695 | memset(&g, 0, sizeof(g)); |
| 691 | 696 | g.now = time(0); |
| 692 | 697 | g.httpHeader = empty_blob; |
| 693 | 698 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -679,14 +679,19 @@ | |
| 679 | } |
| 680 | #endif |
| 681 | |
| 682 | fossil_printf_selfcheck(); |
| 683 | fossil_limit_memory(1); |
| 684 | if( sqlite3_libversion_number()<3035000 ){ |
| 685 | fossil_panic("Unsuitable SQLite version %s, must be at least 3.35.0", |
| 686 | sqlite3_libversion()); |
| 687 | } |
| 688 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 689 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 690 | memset(&g, 0, sizeof(g)); |
| 691 | g.now = time(0); |
| 692 | g.httpHeader = empty_blob; |
| 693 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -679,14 +679,19 @@ | |
| 679 | } |
| 680 | #endif |
| 681 | |
| 682 | fossil_printf_selfcheck(); |
| 683 | fossil_limit_memory(1); |
| 684 | |
| 685 | /* When updating the minimum SQLite version, change the number here, |
| 686 | ** and also MINIMUM_SQLITE_VERSION value set in ../auto.def. Take |
| 687 | ** care that both places agree! */ |
| 688 | if( sqlite3_libversion_number()<3035000 ){ |
| 689 | fossil_panic("Unsuitable SQLite version %s, must be at least 3.35.0", |
| 690 | sqlite3_libversion()); |
| 691 | } |
| 692 | |
| 693 | sqlite3_config(SQLITE_CONFIG_MULTITHREAD); |
| 694 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 695 | memset(&g, 0, sizeof(g)); |
| 696 | g.now = time(0); |
| 697 | g.httpHeader = empty_blob; |
| 698 |
+6
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -65,10 +65,16 @@ | ||
| 65 | 65 | option is included. This helps prevent unix users from accidentally |
| 66 | 66 | creating check-ins that are unreadable by Windows users. |
| 67 | 67 | * Add the "re=" query parameter to the [/help?cmd=/dir|/dir] webpage, |
| 68 | 68 | for symetry with the [/help?cmd=/tree|/tree] page. |
| 69 | 69 | * Update the built-in SQLite to version 3.35.0. |
| 70 | + * The ./configure script now has the --print-minimum-sqlite-version option | |
| 71 | + that prints the minimum SQLite version required by the current version | |
| 72 | + of Fossil. This might be used by integrators who insist on building | |
| 73 | + Fossil to link against the system SQLite library rather than the | |
| 74 | + built-in copy of SQLite, to verify that their system SQLite library | |
| 75 | + is recent enough. | |
| 70 | 76 | |
| 71 | 77 | <a name='v2_14'></a> |
| 72 | 78 | <h2>Changes for Version 2.14 (2021-01-20)</h2> |
| 73 | 79 | |
| 74 | 80 | * <b>Schema Update Notice #1:</b> |
| 75 | 81 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -65,10 +65,16 @@ | |
| 65 | option is included. This helps prevent unix users from accidentally |
| 66 | creating check-ins that are unreadable by Windows users. |
| 67 | * Add the "re=" query parameter to the [/help?cmd=/dir|/dir] webpage, |
| 68 | for symetry with the [/help?cmd=/tree|/tree] page. |
| 69 | * Update the built-in SQLite to version 3.35.0. |
| 70 | |
| 71 | <a name='v2_14'></a> |
| 72 | <h2>Changes for Version 2.14 (2021-01-20)</h2> |
| 73 | |
| 74 | * <b>Schema Update Notice #1:</b> |
| 75 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -65,10 +65,16 @@ | |
| 65 | option is included. This helps prevent unix users from accidentally |
| 66 | creating check-ins that are unreadable by Windows users. |
| 67 | * Add the "re=" query parameter to the [/help?cmd=/dir|/dir] webpage, |
| 68 | for symetry with the [/help?cmd=/tree|/tree] page. |
| 69 | * Update the built-in SQLite to version 3.35.0. |
| 70 | * The ./configure script now has the --print-minimum-sqlite-version option |
| 71 | that prints the minimum SQLite version required by the current version |
| 72 | of Fossil. This might be used by integrators who insist on building |
| 73 | Fossil to link against the system SQLite library rather than the |
| 74 | built-in copy of SQLite, to verify that their system SQLite library |
| 75 | is recent enough. |
| 76 | |
| 77 | <a name='v2_14'></a> |
| 78 | <h2>Changes for Version 2.14 (2021-01-20)</h2> |
| 79 | |
| 80 | * <b>Schema Update Notice #1:</b> |
| 81 |