Fossil SCM

When configuring fossil using "--disable-internal-sqlite" (having SQLite 3.8.1 installed), "./fossil version -v" gives: "SQLite 3.8.2 2013-11-27 14:50:51 c75f561f33", which was not the SQLite version compiled with, neither the SQLite version actually running (3.8.1).

jan.nijtmans 2013-11-29 11:26 UTC trunk
Commit d7806931818cea4fa5d41996d4fbc7fc4204af04
Parent 0047370ce670cd7…
3 files changed +1 -1 +1 -1 +4 -4
~ src/json.c ~ src/main.c ~ src/stat.c
M src/json.c
+1 -1
--- src/json.c
+++ src/json.c
@@ -1980,11 +1980,11 @@
19801980
19811981
 jv2 = cson_value_new_object();
19821982
 jo2 = cson_value_get_object(jv2);
19831983
 cson_object_set(jo, "sqlite", jv2);
19841984
 sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)",
1985
- SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
1985
+ sqlite3_sourceid(), &sqlite3_sourceid()[20], sqlite3_libversion());
19861986
 SETBUF(jo2, "version");
19871987
 zDb = db_name("repository");
19881988
 cson_object_set(jo2, "pageCount", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_count", zDb)));
19891989
 cson_object_set(jo2, "pageSize", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_size", zDb)));
19901990
 cson_object_set(jo2, "freeList", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.freelist_count", zDb)));
19911991
--- src/json.c
+++ src/json.c
@@ -1980,11 +1980,11 @@
1980
1981 jv2 = cson_value_new_object();
1982 jo2 = cson_value_get_object(jv2);
1983 cson_object_set(jo, "sqlite", jv2);
1984 sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)",
1985 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20], SQLITE_VERSION);
1986 SETBUF(jo2, "version");
1987 zDb = db_name("repository");
1988 cson_object_set(jo2, "pageCount", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_count", zDb)));
1989 cson_object_set(jo2, "pageSize", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_size", zDb)));
1990 cson_object_set(jo2, "freeList", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.freelist_count", zDb)));
1991
--- src/json.c
+++ src/json.c
@@ -1980,11 +1980,11 @@
1980
1981 jv2 = cson_value_new_object();
1982 jo2 = cson_value_get_object(jv2);
1983 cson_object_set(jo, "sqlite", jv2);
1984 sqlite3_snprintf(BufLen, zBuf, "%.19s [%.10s] (%s)",
1985 sqlite3_sourceid(), &sqlite3_sourceid()[20], sqlite3_libversion());
1986 SETBUF(jo2, "version");
1987 zDb = db_name("repository");
1988 cson_object_set(jo2, "pageCount", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_count", zDb)));
1989 cson_object_set(jo2, "pageSize", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.page_size", zDb)));
1990 cson_object_set(jo2, "freeList", cson_value_new_integer((cson_int_t)db_int(0, "PRAGMA %s.freelist_count", zDb)));
1991
M src/main.c
+1 -1
--- src/main.c
+++ src/main.c
@@ -835,11 +835,11 @@
835835
 int rc;
836836
 const char *zRc;
837837
 #endif
838838
 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
839839
 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
840
- fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
840
+ fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid());
841841
 fossil_print("Schema version %s\n", AUX_SCHEMA);
842842
 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
843843
 #if defined(FOSSIL_ENABLE_SSL)
844844
 fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
845845
 #endif
846846
--- src/main.c
+++ src/main.c
@@ -835,11 +835,11 @@
835 int rc;
836 const char *zRc;
837 #endif
838 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
839 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
840 fossil_print("SQLite %s %.30s\n", SQLITE_VERSION, SQLITE_SOURCE_ID);
841 fossil_print("Schema version %s\n", AUX_SCHEMA);
842 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
843 #if defined(FOSSIL_ENABLE_SSL)
844 fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
845 #endif
846
--- src/main.c
+++ src/main.c
@@ -835,11 +835,11 @@
835 int rc;
836 const char *zRc;
837 #endif
838 fossil_print("Compiled on %s %s using %s (%d-bit)\n",
839 __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
840 fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid());
841 fossil_print("Schema version %s\n", AUX_SCHEMA);
842 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
843 #if defined(FOSSIL_ENABLE_SSL)
844 fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT);
845 #endif
846
M src/stat.c
+4 -4
--- src/stat.c
+++ src/stat.c
@@ -123,12 +123,12 @@
123123
 @ <tr><th>Project&nbsp;ID:</th><td>%h(db_get("project-code",""))</td></tr>
124124
 @ <tr><th>Fossil&nbsp;Version:</th><td>
125125
 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
126126
 @ (%h(RELEASE_VERSION)) [compiled using %h(COMPILER_NAME)]
127127
 @ </td></tr>
128
- @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(SQLITE_SOURCE_ID)
129
- @ [%.10s(&SQLITE_SOURCE_ID[20])] (%s(SQLITE_VERSION))</td></tr>
128
+ @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
129
+ @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))</td></tr>
130130
 @ <tr><th>Repository Rebuilt:</th><td>
131131
 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
132132
 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
133133
 @ <tr><th>Database&nbsp;Stats:</th><td>
134134
 zDb = db_name("repository");
@@ -224,12 +224,12 @@
224224
 colWidth, "fossil-version:",
225225
 MANIFEST_DATE, MANIFEST_VERSION, RELEASE_VERSION,
226226
 COMPILER_NAME);
227227
 fossil_print("%*s%.19s [%.10s] (%s)\n",
228228
 colWidth, "sqlite-version:",
229
- SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20],
230
- SQLITE_VERSION);
229
+ sqlite3_sourceid(), &sqlite3_sourceid()[20],
230
+ sqlite3_libversion());
231231
 zDb = db_name("repository");
232232
 fossil_print("%*s%d pages, %d bytes/pg, %d free pages, "
233233
 "%s, %s mode\n",
234234
 colWidth, "database-stats:",
235235
 db_int(0, "PRAGMA %s.page_count", zDb),
236236
--- src/stat.c
+++ src/stat.c
@@ -123,12 +123,12 @@
123 @ <tr><th>Project&nbsp;ID:</th><td>%h(db_get("project-code",""))</td></tr>
124 @ <tr><th>Fossil&nbsp;Version:</th><td>
125 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
126 @ (%h(RELEASE_VERSION)) [compiled using %h(COMPILER_NAME)]
127 @ </td></tr>
128 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(SQLITE_SOURCE_ID)
129 @ [%.10s(&SQLITE_SOURCE_ID[20])] (%s(SQLITE_VERSION))</td></tr>
130 @ <tr><th>Repository Rebuilt:</th><td>
131 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
132 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
133 @ <tr><th>Database&nbsp;Stats:</th><td>
134 zDb = db_name("repository");
@@ -224,12 +224,12 @@
224 colWidth, "fossil-version:",
225 MANIFEST_DATE, MANIFEST_VERSION, RELEASE_VERSION,
226 COMPILER_NAME);
227 fossil_print("%*s%.19s [%.10s] (%s)\n",
228 colWidth, "sqlite-version:",
229 SQLITE_SOURCE_ID, &SQLITE_SOURCE_ID[20],
230 SQLITE_VERSION);
231 zDb = db_name("repository");
232 fossil_print("%*s%d pages, %d bytes/pg, %d free pages, "
233 "%s, %s mode\n",
234 colWidth, "database-stats:",
235 db_int(0, "PRAGMA %s.page_count", zDb),
236
--- src/stat.c
+++ src/stat.c
@@ -123,12 +123,12 @@
123 @ <tr><th>Project&nbsp;ID:</th><td>%h(db_get("project-code",""))</td></tr>
124 @ <tr><th>Fossil&nbsp;Version:</th><td>
125 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
126 @ (%h(RELEASE_VERSION)) [compiled using %h(COMPILER_NAME)]
127 @ </td></tr>
128 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
129 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))</td></tr>
130 @ <tr><th>Repository Rebuilt:</th><td>
131 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
132 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
133 @ <tr><th>Database&nbsp;Stats:</th><td>
134 zDb = db_name("repository");
@@ -224,12 +224,12 @@
224 colWidth, "fossil-version:",
225 MANIFEST_DATE, MANIFEST_VERSION, RELEASE_VERSION,
226 COMPILER_NAME);
227 fossil_print("%*s%.19s [%.10s] (%s)\n",
228 colWidth, "sqlite-version:",
229 sqlite3_sourceid(), &sqlite3_sourceid()[20],
230 sqlite3_libversion());
231 zDb = db_name("repository");
232 fossil_print("%*s%d pages, %d bytes/pg, %d free pages, "
233 "%s, %s mode\n",
234 colWidth, "database-stats:",
235 db_int(0, "PRAGMA %s.page_count", zDb),
236

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button