Fossil SCM

Fixes to the verbose mode of the version command. Also, make sure to consistently order optional feature lists.

mistachkin 2013-03-18 06:09 trunk
Commit b85a18ba2016312f71b3f8e200e3ff60628458bd
Parent e3f9a42b5831340…
2 files changed +10 -2 +6 -6
~ src/main.c ~ src/th_main.c
M src/main.c
+10 -2
--- src/main.c
+++ src/main.c
@@ -756,25 +756,33 @@
756756
 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
757757
 if(!find_option("verbose","v",0)){
758758
 return;
759759
 }else{
760760
 int count = 0;
761
- fossil_print("Compiled with the following features enabled:\n",
761
+ fossil_print("Compiled using %s with the following features enabled:\n",
762762
 COMPILER_NAME);
763763
 #if defined(FOSSIL_ENABLE_SSL)
764764
 ++count;
765765
 fossil_print("\tSSL\n");
766766
 #endif
767767
 #if defined(FOSSIL_ENABLE_TCL)
768768
 ++count;
769769
 fossil_print("\tTCL\n");
770770
 #endif
771
+#if defined(FOSSIL_ENABLE_TCL_STUBS)
772
+ ++count;
773
+ fossil_print("\tTCL_STUBS\n");
774
+#endif
771775
 #if defined(FOSSIL_ENABLE_JSON)
772776
 ++count;
773777
 fossil_print("\tJSON\n");
774778
 #endif
775
- if(!count){
779
+#if defined(FOSSIL_ENABLE_MARKDOWN)
780
+ ++count;
781
+ fossil_print("\tMARKDOWN\n");
782
+#endif
783
+ if( !count ){
776784
 fossil_print("\tno optional features enabled.\n");
777785
 }
778786
 }
779787
 }
780788
781789
--- src/main.c
+++ src/main.c
@@ -756,25 +756,33 @@
756 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
757 if(!find_option("verbose","v",0)){
758 return;
759 }else{
760 int count = 0;
761 fossil_print("Compiled with the following features enabled:\n",
762 COMPILER_NAME);
763 #if defined(FOSSIL_ENABLE_SSL)
764 ++count;
765 fossil_print("\tSSL\n");
766 #endif
767 #if defined(FOSSIL_ENABLE_TCL)
768 ++count;
769 fossil_print("\tTCL\n");
770 #endif
 
 
 
 
771 #if defined(FOSSIL_ENABLE_JSON)
772 ++count;
773 fossil_print("\tJSON\n");
774 #endif
775 if(!count){
 
 
 
 
776 fossil_print("\tno optional features enabled.\n");
777 }
778 }
779 }
780
781
--- src/main.c
+++ src/main.c
@@ -756,25 +756,33 @@
756 MANIFEST_VERSION " " MANIFEST_DATE " UTC\n");
757 if(!find_option("verbose","v",0)){
758 return;
759 }else{
760 int count = 0;
761 fossil_print("Compiled using %s with the following features enabled:\n",
762 COMPILER_NAME);
763 #if defined(FOSSIL_ENABLE_SSL)
764 ++count;
765 fossil_print("\tSSL\n");
766 #endif
767 #if defined(FOSSIL_ENABLE_TCL)
768 ++count;
769 fossil_print("\tTCL\n");
770 #endif
771 #if defined(FOSSIL_ENABLE_TCL_STUBS)
772 ++count;
773 fossil_print("\tTCL_STUBS\n");
774 #endif
775 #if defined(FOSSIL_ENABLE_JSON)
776 ++count;
777 fossil_print("\tJSON\n");
778 #endif
779 #if defined(FOSSIL_ENABLE_MARKDOWN)
780 ++count;
781 fossil_print("\tMARKDOWN\n");
782 #endif
783 if( !count ){
784 fossil_print("\tno optional features enabled.\n");
785 }
786 }
787 }
788
789
M src/th_main.c
+6 -6
--- src/th_main.c
+++ src/th_main.c
@@ -261,14 +261,14 @@
261261
 ** TH command: hasfeature STRING
262262
 **
263263
 ** Return true if the fossil binary has the given compile-time feature
264264
 ** enabled. The set of features includes:
265265
 **
266
-** "json" = FOSSIL_ENABLE_JSON
267266
 ** "ssl" = FOSSIL_ENABLE_SSL
268267
 ** "tcl" = FOSSIL_ENABLE_TCL
269268
 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
269
+** "json" = FOSSIL_ENABLE_JSON
270270
 ** "markdown" = FOSSIL_ENABLE_MARKDOWN
271271
 **
272272
 */
273273
 static int hasfeatureCmd(
274274
 Th_Interp *interp,
@@ -284,15 +284,10 @@
284284
 }
285285
 zArg = (char const*)argv[1];
286286
 if(NULL==zArg){
287287
 /* placeholder for following ifdefs... */
288288
 }
289
-#if defined(FOSSIL_ENABLE_JSON)
290
- else if( 0 == fossil_strnicmp( zArg, "json", 4 ) ){
291
- rc = 1;
292
- }
293
-#endif
294289
 #if defined(FOSSIL_ENABLE_SSL)
295290
 else if( 0 == fossil_strnicmp( zArg, "ssl", 3 ) ){
296291
 rc = 1;
297292
 }
298293
 #endif
@@ -303,10 +298,15 @@
303298
 #endif
304299
 #if defined(FOSSIL_ENABLE_TCL_STUBS)
305300
 else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){
306301
 rc = 1;
307302
 }
303
+#endif
304
+#if defined(FOSSIL_ENABLE_JSON)
305
+ else if( 0 == fossil_strnicmp( zArg, "json", 4 ) ){
306
+ rc = 1;
307
+ }
308308
 #endif
309309
 #if defined(FOSSIL_ENABLE_MARKDOWN)
310310
 else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){
311311
 rc = 1;
312312
 }
313313
--- src/th_main.c
+++ src/th_main.c
@@ -261,14 +261,14 @@
261 ** TH command: hasfeature STRING
262 **
263 ** Return true if the fossil binary has the given compile-time feature
264 ** enabled. The set of features includes:
265 **
266 ** "json" = FOSSIL_ENABLE_JSON
267 ** "ssl" = FOSSIL_ENABLE_SSL
268 ** "tcl" = FOSSIL_ENABLE_TCL
269 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
 
270 ** "markdown" = FOSSIL_ENABLE_MARKDOWN
271 **
272 */
273 static int hasfeatureCmd(
274 Th_Interp *interp,
@@ -284,15 +284,10 @@
284 }
285 zArg = (char const*)argv[1];
286 if(NULL==zArg){
287 /* placeholder for following ifdefs... */
288 }
289 #if defined(FOSSIL_ENABLE_JSON)
290 else if( 0 == fossil_strnicmp( zArg, "json", 4 ) ){
291 rc = 1;
292 }
293 #endif
294 #if defined(FOSSIL_ENABLE_SSL)
295 else if( 0 == fossil_strnicmp( zArg, "ssl", 3 ) ){
296 rc = 1;
297 }
298 #endif
@@ -303,10 +298,15 @@
303 #endif
304 #if defined(FOSSIL_ENABLE_TCL_STUBS)
305 else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){
306 rc = 1;
307 }
 
 
 
 
 
308 #endif
309 #if defined(FOSSIL_ENABLE_MARKDOWN)
310 else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){
311 rc = 1;
312 }
313
--- src/th_main.c
+++ src/th_main.c
@@ -261,14 +261,14 @@
261 ** TH command: hasfeature STRING
262 **
263 ** Return true if the fossil binary has the given compile-time feature
264 ** enabled. The set of features includes:
265 **
 
266 ** "ssl" = FOSSIL_ENABLE_SSL
267 ** "tcl" = FOSSIL_ENABLE_TCL
268 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
269 ** "json" = FOSSIL_ENABLE_JSON
270 ** "markdown" = FOSSIL_ENABLE_MARKDOWN
271 **
272 */
273 static int hasfeatureCmd(
274 Th_Interp *interp,
@@ -284,15 +284,10 @@
284 }
285 zArg = (char const*)argv[1];
286 if(NULL==zArg){
287 /* placeholder for following ifdefs... */
288 }
 
 
 
 
 
289 #if defined(FOSSIL_ENABLE_SSL)
290 else if( 0 == fossil_strnicmp( zArg, "ssl", 3 ) ){
291 rc = 1;
292 }
293 #endif
@@ -303,10 +298,15 @@
298 #endif
299 #if defined(FOSSIL_ENABLE_TCL_STUBS)
300 else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){
301 rc = 1;
302 }
303 #endif
304 #if defined(FOSSIL_ENABLE_JSON)
305 else if( 0 == fossil_strnicmp( zArg, "json", 4 ) ){
306 rc = 1;
307 }
308 #endif
309 #if defined(FOSSIL_ENABLE_MARKDOWN)
310 else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){
311 rc = 1;
312 }
313

Keyboard Shortcuts

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