Fossil SCM
(cherry-pick): Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" Change VERSION to 1.37.1 (if ever released, this should at least be in it)
Commit
e79e45444685946ddc7c399162e82fddb56961f2
Parent
80d5408de17888f…
4 files changed
+1
-1
+1
-1
+5
-3
+5
-3
M
VERSION
+1
-1
| --- VERSION | ||
| +++ VERSION | ||
| @@ -1,1 +1,1 @@ | ||
| 1 | -1.37 | |
| 1 | +1.37.1 | |
| 2 | 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.37 |
| 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.37.1 |
| 2 |
M
VERSION
+1
-1
| --- VERSION | ||
| +++ VERSION | ||
| @@ -1,1 +1,1 @@ | ||
| 1 | -1.37 | |
| 1 | +1.37.1 | |
| 2 | 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.37 |
| 2 |
| --- VERSION | |
| +++ VERSION | |
| @@ -1,1 +1,1 @@ | |
| 1 | 1.37.1 |
| 2 |
+5
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -980,14 +980,16 @@ | ||
| 980 | 980 | #endif |
| 981 | 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | 982 | sqlite3_sourceid()); |
| 983 | 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | 984 | db_prepare(&q, |
| 985 | - "SELECT compile_options FROM pragma_compile_options" | |
| 986 | - " WHERE compile_options NOT LIKE 'COMPILER=%%'"); | |
| 985 | + "pragma compile_options"); | |
| 987 | 986 | while( db_step(&q)==SQLITE_ROW ){ |
| 988 | - blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0)); | |
| 987 | + const char *text = db_column_text(&q, 0); | |
| 988 | + if( strncmp(text, "COMPILER", 8) ){ | |
| 989 | + blob_appendf(pOut, "SQLITE_%s\n", text); | |
| 990 | + } | |
| 989 | 991 | } |
| 990 | 992 | db_finalize(&q); |
| 991 | 993 | } |
| 992 | 994 | |
| 993 | 995 | /* |
| 994 | 996 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -980,14 +980,16 @@ | |
| 980 | #endif |
| 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | sqlite3_sourceid()); |
| 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | db_prepare(&q, |
| 985 | "SELECT compile_options FROM pragma_compile_options" |
| 986 | " WHERE compile_options NOT LIKE 'COMPILER=%%'"); |
| 987 | while( db_step(&q)==SQLITE_ROW ){ |
| 988 | blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0)); |
| 989 | } |
| 990 | db_finalize(&q); |
| 991 | } |
| 992 | |
| 993 | /* |
| 994 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -980,14 +980,16 @@ | |
| 980 | #endif |
| 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | sqlite3_sourceid()); |
| 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | db_prepare(&q, |
| 985 | "pragma compile_options"); |
| 986 | while( db_step(&q)==SQLITE_ROW ){ |
| 987 | const char *text = db_column_text(&q, 0); |
| 988 | if( strncmp(text, "COMPILER", 8) ){ |
| 989 | blob_appendf(pOut, "SQLITE_%s\n", text); |
| 990 | } |
| 991 | } |
| 992 | db_finalize(&q); |
| 993 | } |
| 994 | |
| 995 | /* |
| 996 |
+5
-3
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -980,14 +980,16 @@ | ||
| 980 | 980 | #endif |
| 981 | 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | 982 | sqlite3_sourceid()); |
| 983 | 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | 984 | db_prepare(&q, |
| 985 | - "SELECT compile_options FROM pragma_compile_options" | |
| 986 | - " WHERE compile_options NOT LIKE 'COMPILER=%%'"); | |
| 985 | + "pragma compile_options"); | |
| 987 | 986 | while( db_step(&q)==SQLITE_ROW ){ |
| 988 | - blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0)); | |
| 987 | + const char *text = db_column_text(&q, 0); | |
| 988 | + if( strncmp(text, "COMPILER", 8) ){ | |
| 989 | + blob_appendf(pOut, "SQLITE_%s\n", text); | |
| 990 | + } | |
| 989 | 991 | } |
| 990 | 992 | db_finalize(&q); |
| 991 | 993 | } |
| 992 | 994 | |
| 993 | 995 | /* |
| 994 | 996 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -980,14 +980,16 @@ | |
| 980 | #endif |
| 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | sqlite3_sourceid()); |
| 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | db_prepare(&q, |
| 985 | "SELECT compile_options FROM pragma_compile_options" |
| 986 | " WHERE compile_options NOT LIKE 'COMPILER=%%'"); |
| 987 | while( db_step(&q)==SQLITE_ROW ){ |
| 988 | blob_appendf(pOut, "SQLITE_%s\n", db_column_text(&q, 0)); |
| 989 | } |
| 990 | db_finalize(&q); |
| 991 | } |
| 992 | |
| 993 | /* |
| 994 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -980,14 +980,16 @@ | |
| 980 | #endif |
| 981 | blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(), |
| 982 | sqlite3_sourceid()); |
| 983 | if( g.db==0 ) sqlite3_open(":memory:", &g.db); |
| 984 | db_prepare(&q, |
| 985 | "pragma compile_options"); |
| 986 | while( db_step(&q)==SQLITE_ROW ){ |
| 987 | const char *text = db_column_text(&q, 0); |
| 988 | if( strncmp(text, "COMPILER", 8) ){ |
| 989 | blob_appendf(pOut, "SQLITE_%s\n", text); |
| 990 | } |
| 991 | } |
| 992 | db_finalize(&q); |
| 993 | } |
| 994 | |
| 995 | /* |
| 996 |