Fossil SCM

Provide more information about compile-time options to the "fossil version -v" command.

drh 2017-01-16 23:34 UTC trunk
Commit 3192b13d200d3b3cebf0b64d80fc92ee1afbf70c
Parent 66a6377ed205c60…
2 files changed +13 +18 -6
~ src/fusefs.c ~ src/main.c
M src/fusefs.c
+13
--- src/fusefs.c
+++ src/fusefs.c
@@ -337,5 +337,18 @@
337337
 fuse_main(4, azNewArgv, &fusefs_methods, NULL);
338338
 fusefs_reset();
339339
 fusefs_clear_path();
340340
 }
341341
 #endif /* FOSSIL_HAVE_FUSEFS */
342
+
343
+/*
344
+** Return the version number of the fuse library.
345
+*/
346
+const char *fusefs_lib_version(void){
347
+#ifdef FOSSIL_HAVE_FUSEFS
348
+# define STRINGIFY_(X) #X
349
+# define STRINGIFY(X) STRINGIFY_(X)
350
+ return STRINGIFY(FUSE_MAJOR_VERSION) "." STRINGIFY(FUSE_MINOR_VERSION);
351
+#else
352
+ return 0;
353
+#endif
354
+}
342355
--- src/fusefs.c
+++ src/fusefs.c
@@ -337,5 +337,18 @@
337 fuse_main(4, azNewArgv, &fusefs_methods, NULL);
338 fusefs_reset();
339 fusefs_clear_path();
340 }
341 #endif /* FOSSIL_HAVE_FUSEFS */
 
 
 
 
 
 
 
 
 
 
 
 
 
342
--- src/fusefs.c
+++ src/fusefs.c
@@ -337,5 +337,18 @@
337 fuse_main(4, azNewArgv, &fusefs_methods, NULL);
338 fusefs_reset();
339 fusefs_clear_path();
340 }
341 #endif /* FOSSIL_HAVE_FUSEFS */
342
343 /*
344 ** Return the version number of the fuse library.
345 */
346 const char *fusefs_lib_version(void){
347 #ifdef FOSSIL_HAVE_FUSEFS
348 # define STRINGIFY_(X) #X
349 # define STRINGIFY(X) STRINGIFY_(X)
350 return STRINGIFY(FUSE_MAJOR_VERSION) "." STRINGIFY(FUSE_MINOR_VERSION);
351 #else
352 return 0;
353 #endif
354 }
355
M src/main.c
+18 -6
--- src/main.c
+++ src/main.c
@@ -931,21 +931,30 @@
931931
 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
932932
 #endif
933933
 #if defined(FOSSIL_ENABLE_SSL)
934934
 blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935935
 #endif
936
+#if defined(FOSSIL_HAVE_FUSEFS)
937
+ blob_appendf(pOut, "libfuse version %s\n", fusefs_lib_version());
938
+#endif
939
+#if defined(FOSSIL_DEBUG)
940
+ blob_append(pOut, "FOSSIL_DEBUG\n", -1);
941
+#endif
942
+#if defined(FOSSIL_OMIT_DELTA_CKSUM_TEST)
943
+ blob_append(pOut, "FOSSIL_OMIT_DELTA_CKSUM_TEST\n", -1);
944
+#endif
936945
 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
937
- blob_append(pOut, "LEGACY_MV_RM\n", -1);
946
+ blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
938947
 #endif
939948
 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
940
- blob_append(pOut, "EXEC_REL_PATHS\n", -1);
949
+ blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
941950
 #endif
942951
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
943
- blob_append(pOut, "TH1_DOCS\n", -1);
952
+ blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
944953
 #endif
945954
 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
946
- blob_append(pOut, "TH1_HOOKS\n", -1);
955
+ blob_append(pOut, "FOSSIL_ENABLE_TH1_HOOKS\n", -1);
947956
 #endif
948957
 #if defined(FOSSIL_ENABLE_TCL)
949958
 Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_FORCE_TCL);
950959
 rc = Th_Eval(g.interp, 0, "tclInvoke info patchlevel", -1);
951960
 zRc = Th_ReturnCodeName(rc, 0);
@@ -955,14 +964,14 @@
955964
 #endif
956965
 #if defined(USE_TCL_STUBS)
957966
 blob_append(pOut, "USE_TCL_STUBS\n", -1);
958967
 #endif
959968
 #if defined(FOSSIL_ENABLE_TCL_STUBS)
960
- blob_append(pOut, "TCL_STUBS\n", -1);
969
+ blob_append(pOut, "FOSSIL_TCL_STUBS\n", -1);
961970
 #endif
962971
 #if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
963
- blob_append(pOut, "TCL_PRIVATE_STUBS\n", -1);
972
+ blob_append(pOut, "FOSSIL_ENABLE_TCL_PRIVATE_STUBS\n", -1);
964973
 #endif
965974
 #if defined(FOSSIL_ENABLE_JSON)
966975
 blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
967976
 #endif
968977
 #if defined(BROKEN_MINGW_CMDLINE)
@@ -976,10 +985,13 @@
976985
 blob_append(pOut, "STATIC_BUILD\n", -1);
977986
 #endif
978987
 #if defined(USE_SEE)
979988
 blob_append(pOut, "USE_SEE\n", -1);
980989
 #endif
990
+#if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
991
+ blob_append(pOut, "FOSSIL_ALLOW_OUT_OF_ORDER_DATES\n");
992
+#endif
981993
 blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
982994
 sqlite3_sourceid());
983995
 if( g.db==0 ) sqlite3_open(":memory:", &g.db);
984996
 db_prepare(&q,
985997
 "SELECT compile_options FROM pragma_compile_options"
986998
--- src/main.c
+++ src/main.c
@@ -931,21 +931,30 @@
931 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
932 #endif
933 #if defined(FOSSIL_ENABLE_SSL)
934 blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935 #endif
 
 
 
 
 
 
 
 
 
936 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
937 blob_append(pOut, "LEGACY_MV_RM\n", -1);
938 #endif
939 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
940 blob_append(pOut, "EXEC_REL_PATHS\n", -1);
941 #endif
942 #if defined(FOSSIL_ENABLE_TH1_DOCS)
943 blob_append(pOut, "TH1_DOCS\n", -1);
944 #endif
945 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
946 blob_append(pOut, "TH1_HOOKS\n", -1);
947 #endif
948 #if defined(FOSSIL_ENABLE_TCL)
949 Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_FORCE_TCL);
950 rc = Th_Eval(g.interp, 0, "tclInvoke info patchlevel", -1);
951 zRc = Th_ReturnCodeName(rc, 0);
@@ -955,14 +964,14 @@
955 #endif
956 #if defined(USE_TCL_STUBS)
957 blob_append(pOut, "USE_TCL_STUBS\n", -1);
958 #endif
959 #if defined(FOSSIL_ENABLE_TCL_STUBS)
960 blob_append(pOut, "TCL_STUBS\n", -1);
961 #endif
962 #if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
963 blob_append(pOut, "TCL_PRIVATE_STUBS\n", -1);
964 #endif
965 #if defined(FOSSIL_ENABLE_JSON)
966 blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
967 #endif
968 #if defined(BROKEN_MINGW_CMDLINE)
@@ -976,10 +985,13 @@
976 blob_append(pOut, "STATIC_BUILD\n", -1);
977 #endif
978 #if defined(USE_SEE)
979 blob_append(pOut, "USE_SEE\n", -1);
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
--- src/main.c
+++ src/main.c
@@ -931,21 +931,30 @@
931 blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
932 #endif
933 #if defined(FOSSIL_ENABLE_SSL)
934 blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
935 #endif
936 #if defined(FOSSIL_HAVE_FUSEFS)
937 blob_appendf(pOut, "libfuse version %s\n", fusefs_lib_version());
938 #endif
939 #if defined(FOSSIL_DEBUG)
940 blob_append(pOut, "FOSSIL_DEBUG\n", -1);
941 #endif
942 #if defined(FOSSIL_OMIT_DELTA_CKSUM_TEST)
943 blob_append(pOut, "FOSSIL_OMIT_DELTA_CKSUM_TEST\n", -1);
944 #endif
945 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
946 blob_append(pOut, "FOSSIL_ENABLE_LEGACY_MV_RM\n", -1);
947 #endif
948 #if defined(FOSSIL_ENABLE_EXEC_REL_PATHS)
949 blob_append(pOut, "FOSSIL_ENABLE_EXEC_REL_PATHS\n", -1);
950 #endif
951 #if defined(FOSSIL_ENABLE_TH1_DOCS)
952 blob_append(pOut, "FOSSIL_ENABLE_TH1_DOCS\n", -1);
953 #endif
954 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
955 blob_append(pOut, "FOSSIL_ENABLE_TH1_HOOKS\n", -1);
956 #endif
957 #if defined(FOSSIL_ENABLE_TCL)
958 Th_FossilInit(TH_INIT_DEFAULT | TH_INIT_FORCE_TCL);
959 rc = Th_Eval(g.interp, 0, "tclInvoke info patchlevel", -1);
960 zRc = Th_ReturnCodeName(rc, 0);
@@ -955,14 +964,14 @@
964 #endif
965 #if defined(USE_TCL_STUBS)
966 blob_append(pOut, "USE_TCL_STUBS\n", -1);
967 #endif
968 #if defined(FOSSIL_ENABLE_TCL_STUBS)
969 blob_append(pOut, "FOSSIL_TCL_STUBS\n", -1);
970 #endif
971 #if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
972 blob_append(pOut, "FOSSIL_ENABLE_TCL_PRIVATE_STUBS\n", -1);
973 #endif
974 #if defined(FOSSIL_ENABLE_JSON)
975 blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
976 #endif
977 #if defined(BROKEN_MINGW_CMDLINE)
@@ -976,10 +985,13 @@
985 blob_append(pOut, "STATIC_BUILD\n", -1);
986 #endif
987 #if defined(USE_SEE)
988 blob_append(pOut, "USE_SEE\n", -1);
989 #endif
990 #if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
991 blob_append(pOut, "FOSSIL_ALLOW_OUT_OF_ORDER_DATES\n");
992 #endif
993 blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
994 sqlite3_sourceid());
995 if( g.db==0 ) sqlite3_open(":memory:", &g.db);
996 db_prepare(&q,
997 "SELECT compile_options FROM pragma_compile_options"
998

Keyboard Shortcuts

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