Fossil SCM

Add a web-page, where we can see the details on how SQLite was compiled (pragma compile_options), as sub-page for "stat".

jan.nijtmans 2017-01-04 10:40 trunk
Commit eac405d7d6557fee8371dede5da148ff9468c671
Parent a8cd1e542787add…
4 files changed +21 -6 +2 -1
~ ajax/cgi-bin/fossil-json.cgi.example ~ autosetup/test-tclsh ~ src/main.c ~ src/stat.c
M autosetup/test-tclsh

No diff available

M src/main.c
+21 -6
--- src/main.c
+++ src/main.c
@@ -1022,21 +1022,36 @@
10221022
 **
10231023
 ** verbose Show all available details.
10241024
 */
10251025
 void test_version_page(void){
10261026
 Blob versionInfo;
1027
- int verboseFlag;
1027
+ const char *verboseFlag;
10281028
10291029
 login_check_credentials();
10301030
 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1031
- verboseFlag = P("verbose")!=0;
1031
+ verboseFlag = P("verbose");
10321032
 style_header("Version Information");
10331033
 style_submenu_element("Stat", "stat");
1034
- get_version_blob(&versionInfo, verboseFlag);
1035
- @ <blockquote><pre>
1036
- @ %h(blob_str(&versionInfo))
1037
- @ </pre></blockquote>
1034
+ if( verboseFlag != 0 && !strcmp(verboseFlag, "2") ){
1035
+ Stmt loop;
1036
+ style_submenu_element("Fossil version", "version?verbose=1");
1037
+ blob_zero(&versionInfo);
1038
+ blob_appendf(&versionInfo, "SQLite %s %.30s\n",
1039
+ sqlite3_libversion(), sqlite3_sourceid());
1040
+ db_prepare(&loop, "pragma compile_options;");
1041
+ while( db_step(&loop)==SQLITE_ROW ){
1042
+ blob_appendf(&versionInfo, "%s\n", db_column_text(&loop, 0));
1043
+ }
1044
+ db_finalize(&loop);
1045
+
1046
+ }else{
1047
+ style_submenu_element("SQLite version", "version?verbose=2");
1048
+ get_version_blob(&versionInfo, verboseFlag != 0);
1049
+ }
1050
+ cgi_printf("<blockquote><pre>\n"
1051
+ "%h\n"
1052
+ "</pre></blockquote>\n",(blob_str(&versionInfo)));
10381053
 style_footer();
10391054
 }
10401055
10411056
10421057
 /*
10431058
--- src/main.c
+++ src/main.c
@@ -1022,21 +1022,36 @@
1022 **
1023 ** verbose Show all available details.
1024 */
1025 void test_version_page(void){
1026 Blob versionInfo;
1027 int verboseFlag;
1028
1029 login_check_credentials();
1030 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1031 verboseFlag = P("verbose")!=0;
1032 style_header("Version Information");
1033 style_submenu_element("Stat", "stat");
1034 get_version_blob(&versionInfo, verboseFlag);
1035 @ <blockquote><pre>
1036 @ %h(blob_str(&versionInfo))
1037 @ </pre></blockquote>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1038 style_footer();
1039 }
1040
1041
1042 /*
1043
--- src/main.c
+++ src/main.c
@@ -1022,21 +1022,36 @@
1022 **
1023 ** verbose Show all available details.
1024 */
1025 void test_version_page(void){
1026 Blob versionInfo;
1027 const char *verboseFlag;
1028
1029 login_check_credentials();
1030 if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
1031 verboseFlag = P("verbose");
1032 style_header("Version Information");
1033 style_submenu_element("Stat", "stat");
1034 if( verboseFlag != 0 && !strcmp(verboseFlag, "2") ){
1035 Stmt loop;
1036 style_submenu_element("Fossil version", "version?verbose=1");
1037 blob_zero(&versionInfo);
1038 blob_appendf(&versionInfo, "SQLite %s %.30s\n",
1039 sqlite3_libversion(), sqlite3_sourceid());
1040 db_prepare(&loop, "pragma compile_options;");
1041 while( db_step(&loop)==SQLITE_ROW ){
1042 blob_appendf(&versionInfo, "%s\n", db_column_text(&loop, 0));
1043 }
1044 db_finalize(&loop);
1045
1046 }else{
1047 style_submenu_element("SQLite version", "version?verbose=2");
1048 get_version_blob(&versionInfo, verboseFlag != 0);
1049 }
1050 cgi_printf("<blockquote><pre>\n"
1051 "%h\n"
1052 "</pre></blockquote>\n",(blob_str(&versionInfo)));
1053 style_footer();
1054 }
1055
1056
1057 /*
1058
M src/stat.c
+2 -1
--- src/stat.c
+++ src/stat.c
@@ -181,11 +181,12 @@
181181
 @ <tr><th>Fossil&nbsp;Version:</th><td>
182182
 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
183183
 @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a>
184184
 @ </td></tr>
185185
 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
186
- @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))</td></tr>
186
+ @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))
187
+ @ <a href='version?verbose=2'>(details)</a></td></tr>
187188
 @ <tr><th>Schema&nbsp;Version:</th><td>%h(g.zAuxSchema)</td></tr>
188189
 @ <tr><th>Repository Rebuilt:</th><td>
189190
 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
190191
 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
191192
 @ <tr><th>Database&nbsp;Stats:</th><td>
192193
--- src/stat.c
+++ src/stat.c
@@ -181,11 +181,12 @@
181 @ <tr><th>Fossil&nbsp;Version:</th><td>
182 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
183 @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a>
184 @ </td></tr>
185 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
186 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))</td></tr>
 
187 @ <tr><th>Schema&nbsp;Version:</th><td>%h(g.zAuxSchema)</td></tr>
188 @ <tr><th>Repository Rebuilt:</th><td>
189 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
190 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
191 @ <tr><th>Database&nbsp;Stats:</th><td>
192
--- src/stat.c
+++ src/stat.c
@@ -181,11 +181,12 @@
181 @ <tr><th>Fossil&nbsp;Version:</th><td>
182 @ %h(MANIFEST_DATE) %h(MANIFEST_VERSION)
183 @ (%h(RELEASE_VERSION)) <a href='version?verbose=1'>(details)</a>
184 @ </td></tr>
185 @ <tr><th>SQLite&nbsp;Version:</th><td>%.19s(sqlite3_sourceid())
186 @ [%.10s(&sqlite3_sourceid()[20])] (%s(sqlite3_libversion()))
187 @ <a href='version?verbose=2'>(details)</a></td></tr>
188 @ <tr><th>Schema&nbsp;Version:</th><td>%h(g.zAuxSchema)</td></tr>
189 @ <tr><th>Repository Rebuilt:</th><td>
190 @ %h(db_get_mtime("rebuilt","%Y-%m-%d %H:%M:%S","Never"))
191 @ By Fossil %h(db_get("rebuilt","Unknown"))</td></tr>
192 @ <tr><th>Database&nbsp;Stats:</th><td>
193

Keyboard Shortcuts

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