Fossil

Check-in [e452aa97f1]
Login

Check-in [e452aa97f1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Improve consistency of the version information.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: e452aa97f1789601afb60b421394e9cf8013e467
User & Date: mistachkin 2013-03-18 07:05:48.171
Context
2013-03-18
07:10
Rename blob_remove_cr() to blob_to_lf_only() since that is what it now does. Also, improvements to style and related comments. ... (check-in: 757585fb28 user: mistachkin tags: trunk)
07:05
Improve consistency of the version information. ... (check-in: e452aa97f1 user: mistachkin tags: trunk)
06:09
Fixes to the verbose mode of the version command. Also, make sure to consistently order optional feature lists. ... (check-in: b85a18ba20 user: mistachkin tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/main.c.
︙︙
27
28
29
30
31
32
33




34



35
36
37
38
39
40
41
42
43
44
45
46
47
48

#include <sys/stat.h>
#include <stdlib.h> /* atexit() */
#if defined(_WIN32)
#  include <windows.h>
#else
#  include <errno.h> /* errno global */
#endif




#if INTERFACE



#ifdef FOSSIL_ENABLE_JSON
#  include "cson_amalgamation.h" /* JSON API. */
#  include "json_detail.h"
#endif
#ifdef FOSSIL_ENABLE_TCL
#include "tcl.h"
#endif

/*
** Number of elements in an array
*/
#define count(X)  (sizeof(X)/sizeof(X[0]))

/*








>
>
>
>

>
>
>




<
<
<








27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45



46
47
48
49
50
51
52

#include <sys/stat.h>
#include <stdlib.h> /* atexit() */
#if defined(_WIN32)
#  include <windows.h>
#else
#  include <errno.h> /* errno global */
#endif
#include "zlib.h"
#ifdef FOSSIL_ENABLE_SSL
#  include "openssl/opensslv.h"
#endif
#if INTERFACE
#ifdef FOSSIL_ENABLE_TCL
#  include "tcl.h"
#endif
#ifdef FOSSIL_ENABLE_JSON
#  include "cson_amalgamation.h" /* JSON API. */
#  include "json_detail.h"
#endif




/*
** Number of elements in an array
*/
#define count(X)  (sizeof(X)/sizeof(X[0]))

/*
︙︙
749
750
751
752
753
754
755
756
757
758
759
760

761
762

763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791

** Print the source code version number for the fossil executable.
** If the verbose option is specified, additional details will
** be output about what optional features this binary was compiled
** with
*/
void version_cmd(void){
  fossil_print("This is fossil version " RELEASE_VERSION " "
                MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
  if(!find_option("verbose","v",0)){
    return;
  }else{
    int count = 0;

    fossil_print("Compiled using %s with the following features enabled:\n",
                 COMPILER_NAME);

#if defined(FOSSIL_ENABLE_SSL)
    ++count;
    fossil_print("\tSSL\n");
#endif
#if defined(FOSSIL_ENABLE_TCL)
    ++count;
    fossil_print("\tTCL\n");
#endif
#if defined(FOSSIL_ENABLE_TCL_STUBS)
    ++count;
    fossil_print("\tTCL_STUBS\n");
#endif
#if defined(FOSSIL_ENABLE_JSON)
    ++count;
    fossil_print("\tJSON\n");
#endif
#if defined(FOSSIL_ENABLE_MARKDOWN)
    ++count;
    fossil_print("\tMARKDOWN\n");
#endif
    if( !count ){
      fossil_print("\tno optional features enabled.\n");
    }
  }
}


/*
** COMMAND: help








|




>
|
|
>


|



|







|






|








753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797

** Print the source code version number for the fossil executable.
** If the verbose option is specified, additional details will
** be output about what optional features this binary was compiled
** with
*/
void version_cmd(void){
  fossil_print("This is fossil version " RELEASE_VERSION " "
               MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
  if(!find_option("verbose","v",0)){
    return;
  }else{
    int count = 0;
    fossil_print("\nCompiled using \"%s\" with\nSQLite %s [%s],\nzlib %s, "
                 "and the following optional features enabled:\n\n",
                 COMPILER_NAME, SQLITE_VERSION, SQLITE_SOURCE_ID,
                 ZLIB_VERSION);
#if defined(FOSSIL_ENABLE_SSL)
    ++count;
    fossil_print("\tSSL (%s)\n", OPENSSL_VERSION_TEXT);
#endif
#if defined(FOSSIL_ENABLE_TCL)
    ++count;
    fossil_print("\tTCL (Tcl %s)\n", TCL_PATCH_LEVEL);
#endif
#if defined(FOSSIL_ENABLE_TCL_STUBS)
    ++count;
    fossil_print("\tTCL_STUBS\n");
#endif
#if defined(FOSSIL_ENABLE_JSON)
    ++count;
    fossil_print("\tJSON (API %s)\n", FOSSIL_JSON_API_VERSION);
#endif
#if defined(FOSSIL_ENABLE_MARKDOWN)
    ++count;
    fossil_print("\tMARKDOWN\n");
#endif
    if( !count ){
      fossil_print("\tNo optional features were enabled.\n");
    }
  }
}


/*
** COMMAND: help
︙︙
Changes to win/fossil.rc.
︙︙
34
35
36
37
38
39
40




41
42
43
44
45
46
47

#include "openssl/opensslv.h"
#endif

#ifdef FOSSIL_ENABLE_TCL
#include "tcl.h"
#endif





/*
 * English (U.S.) resources
 */

#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)








>
>
>
>








34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

#include "openssl/opensslv.h"
#endif

#ifdef FOSSIL_ENABLE_TCL
#include "tcl.h"
#endif

#ifdef FOSSIL_ENABLE_JSON
#include "json_detail.h"
#endif

/*
 * English (U.S.) resources
 */

#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
︙︙
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

#ifdef FOSSIL_ENABLE_TCL_STUBS
      VALUE "TclStubsEnabled", "Yes\0"
#else
      VALUE "TclStubsEnabled", "No\0"
#endif
#endif
#ifdef FOSSIL_ENABLE_JSON
      VALUE "JsonEnabled", "Yes, cson\0"
#endif
#ifdef FOSSIL_ENABLE_MARKDOWN
      VALUE "MarkdownEnabled", "Yes\0"
#endif
    END
  END
  BLOCK "VarFileInfo"
  BEGIN
    VALUE "Translation", 0x409, 0x4B0
  END
END








|












104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122

#ifdef FOSSIL_ENABLE_TCL_STUBS
      VALUE "TclStubsEnabled", "Yes\0"
#else
      VALUE "TclStubsEnabled", "No\0"
#endif
#endif
#ifdef FOSSIL_ENABLE_JSON
      VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
#endif
#ifdef FOSSIL_ENABLE_MARKDOWN
      VALUE "MarkdownEnabled", "Yes\0"
#endif
    END
  END
  BLOCK "VarFileInfo"
  BEGIN
    VALUE "Translation", 0x409, 0x4B0
  END
END