Fossil SCM
Improved formatting and additional information output for "fossil version --verbose".
Commit
1b0e8cf9c0185d14acf6ae249dc9ff46fdb47249
Parent
9734d2cd4535854…
1 file changed
+8
-11
+8
-11
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -786,33 +786,30 @@ | ||
| 786 | 786 | MANIFEST_VERSION " " MANIFEST_DATE " UTC\n"); |
| 787 | 787 | if(!find_option("verbose","v",0)){ |
| 788 | 788 | return; |
| 789 | 789 | }else{ |
| 790 | 790 | int count = 0; |
| 791 | - fossil_print("\nCompiled using \"%s\" with\nSQLite %s [%s],\nzlib %s, " | |
| 792 | - "and the following optional features enabled:\n\n", | |
| 793 | - COMPILER_NAME, SQLITE_VERSION, SQLITE_SOURCE_ID, | |
| 794 | - ZLIB_VERSION); | |
| 791 | + fossil_print("Compiled on %s %s using %s (%d-bit)\n", | |
| 792 | + __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); | |
| 793 | + fossil_print("SQLite %s [%s],\n", SQLITE_VERSION, SQLITE_SOURCE_ID); | |
| 794 | + fossil_print("zlib %s\n", ZLIB_VERSION); | |
| 795 | 795 | #if defined(FOSSIL_ENABLE_SSL) |
| 796 | 796 | ++count; |
| 797 | - fossil_print("\tSSL (%s)\n", OPENSSL_VERSION_TEXT); | |
| 797 | + fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT); | |
| 798 | 798 | #endif |
| 799 | 799 | #if defined(FOSSIL_ENABLE_TCL) |
| 800 | 800 | ++count; |
| 801 | - fossil_print("\tTCL (Tcl %s)\n", TCL_PATCH_LEVEL); | |
| 801 | + fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL); | |
| 802 | 802 | #endif |
| 803 | 803 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 804 | 804 | ++count; |
| 805 | - fossil_print("\tTCL_STUBS\n"); | |
| 805 | + fossil_print("TCL_STUBS\n"); | |
| 806 | 806 | #endif |
| 807 | 807 | #if defined(FOSSIL_ENABLE_JSON) |
| 808 | 808 | ++count; |
| 809 | - fossil_print("\tJSON (API %s)\n", FOSSIL_JSON_API_VERSION); | |
| 809 | + fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION); | |
| 810 | 810 | #endif |
| 811 | - if( !count ){ | |
| 812 | - fossil_print("\tNo optional features were enabled.\n"); | |
| 813 | - } | |
| 814 | 811 | } |
| 815 | 812 | } |
| 816 | 813 | |
| 817 | 814 | |
| 818 | 815 | /* |
| 819 | 816 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -786,33 +786,30 @@ | |
| 786 | MANIFEST_VERSION " " MANIFEST_DATE " UTC\n"); |
| 787 | if(!find_option("verbose","v",0)){ |
| 788 | return; |
| 789 | }else{ |
| 790 | int count = 0; |
| 791 | fossil_print("\nCompiled using \"%s\" with\nSQLite %s [%s],\nzlib %s, " |
| 792 | "and the following optional features enabled:\n\n", |
| 793 | COMPILER_NAME, SQLITE_VERSION, SQLITE_SOURCE_ID, |
| 794 | ZLIB_VERSION); |
| 795 | #if defined(FOSSIL_ENABLE_SSL) |
| 796 | ++count; |
| 797 | fossil_print("\tSSL (%s)\n", OPENSSL_VERSION_TEXT); |
| 798 | #endif |
| 799 | #if defined(FOSSIL_ENABLE_TCL) |
| 800 | ++count; |
| 801 | fossil_print("\tTCL (Tcl %s)\n", TCL_PATCH_LEVEL); |
| 802 | #endif |
| 803 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 804 | ++count; |
| 805 | fossil_print("\tTCL_STUBS\n"); |
| 806 | #endif |
| 807 | #if defined(FOSSIL_ENABLE_JSON) |
| 808 | ++count; |
| 809 | fossil_print("\tJSON (API %s)\n", FOSSIL_JSON_API_VERSION); |
| 810 | #endif |
| 811 | if( !count ){ |
| 812 | fossil_print("\tNo optional features were enabled.\n"); |
| 813 | } |
| 814 | } |
| 815 | } |
| 816 | |
| 817 | |
| 818 | /* |
| 819 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -786,33 +786,30 @@ | |
| 786 | MANIFEST_VERSION " " MANIFEST_DATE " UTC\n"); |
| 787 | if(!find_option("verbose","v",0)){ |
| 788 | return; |
| 789 | }else{ |
| 790 | int count = 0; |
| 791 | fossil_print("Compiled on %s %s using %s (%d-bit)\n", |
| 792 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 793 | fossil_print("SQLite %s [%s],\n", SQLITE_VERSION, SQLITE_SOURCE_ID); |
| 794 | fossil_print("zlib %s\n", ZLIB_VERSION); |
| 795 | #if defined(FOSSIL_ENABLE_SSL) |
| 796 | ++count; |
| 797 | fossil_print("SSL (%s)\n", OPENSSL_VERSION_TEXT); |
| 798 | #endif |
| 799 | #if defined(FOSSIL_ENABLE_TCL) |
| 800 | ++count; |
| 801 | fossil_print("TCL (Tcl %s)\n", TCL_PATCH_LEVEL); |
| 802 | #endif |
| 803 | #if defined(FOSSIL_ENABLE_TCL_STUBS) |
| 804 | ++count; |
| 805 | fossil_print("TCL_STUBS\n"); |
| 806 | #endif |
| 807 | #if defined(FOSSIL_ENABLE_JSON) |
| 808 | ++count; |
| 809 | fossil_print("JSON (API %s)\n", FOSSIL_JSON_API_VERSION); |
| 810 | #endif |
| 811 | } |
| 812 | } |
| 813 | |
| 814 | |
| 815 | /* |
| 816 |