Fossil SCM

Only define and use the new 'move-files' and 'remove-files' settings when compiled with the FOSSIL_ENABLE_LEGACY_MV_RM option.

mistachkin 2015-03-03 23:25 mvAndRmFiles
Commit c227e14f800029a0a5594f31584cecd24c8a7e92
Parent 0a0be9e1e14aba6…
11 files changed +7 +42 +3 +8 -2 +3 +18 +6 +10 +10 +8 +5
~ auto.def ~ src/add.c ~ src/configure.c ~ src/db.c ~ src/main.c ~ src/makemake.tcl ~ src/th_main.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/fossil.rc
M auto.def
+7
--- auto.def
+++ auto.def
@@ -5,10 +5,11 @@
55
 options {
66
 with-openssl:path|auto|none
77
 => {Look for OpenSSL in the given path, or auto or none}
88
 with-miniz=0 => {Use miniz from the source tree}
99
 with-zlib:path => {Look for zlib in the given path}
10
+ with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
1011
 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
1112
 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1213
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1314
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1415
 with-tcl-private-stubs=0
@@ -85,10 +86,16 @@
8586
 # reading config.h first.
8687
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
8788
 define FOSSIL_ENABLE_JSON
8889
 msg-result "JSON support enabled"
8990
 }
91
+
92
+if {[opt-bool with-legacy-mv-rm]} {
93
+ define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM
94
+ define FOSSIL_ENABLE_LEGACY_MV_RM
95
+ msg-result "Legacy mv/rm support enabled"
96
+}
9097
9198
 if {[opt-bool with-th1-docs]} {
9299
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_DOCS
93100
 define FOSSIL_ENABLE_TH1_DOCS
94101
 msg-result "TH1 embedded documentation support enabled"
95102
--- auto.def
+++ auto.def
@@ -5,10 +5,11 @@
5 options {
6 with-openssl:path|auto|none
7 => {Look for OpenSSL in the given path, or auto or none}
8 with-miniz=0 => {Use miniz from the source tree}
9 with-zlib:path => {Look for zlib in the given path}
 
10 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
11 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
12 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
13 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
14 with-tcl-private-stubs=0
@@ -85,10 +86,16 @@
85 # reading config.h first.
86 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
87 define FOSSIL_ENABLE_JSON
88 msg-result "JSON support enabled"
89 }
 
 
 
 
 
 
90
91 if {[opt-bool with-th1-docs]} {
92 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_DOCS
93 define FOSSIL_ENABLE_TH1_DOCS
94 msg-result "TH1 embedded documentation support enabled"
95
--- auto.def
+++ auto.def
@@ -5,10 +5,11 @@
5 options {
6 with-openssl:path|auto|none
7 => {Look for OpenSSL in the given path, or auto or none}
8 with-miniz=0 => {Use miniz from the source tree}
9 with-zlib:path => {Look for zlib in the given path}
10 with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
11 with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
12 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
13 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
14 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
15 with-tcl-private-stubs=0
@@ -85,10 +86,16 @@
86 # reading config.h first.
87 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
88 define FOSSIL_ENABLE_JSON
89 msg-result "JSON support enabled"
90 }
91
92 if {[opt-bool with-legacy-mv-rm]} {
93 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM
94 define FOSSIL_ENABLE_LEGACY_MV_RM
95 msg-result "Legacy mv/rm support enabled"
96 }
97
98 if {[opt-bool with-th1-docs]} {
99 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_DOCS
100 define FOSSIL_ENABLE_TH1_DOCS
101 msg-result "TH1 embedded documentation support enabled"
102
M src/add.c
+42
--- src/add.c
+++ src/add.c
@@ -22,10 +22,44 @@
2222
 #include "add.h"
2323
 #include <assert.h>
2424
 #include <dirent.h>
2525
 #include "cygsup.h"
2626
27
+/*
28
+** WARNING: For Fossil version 1.x this value was always zero. For Fossil
29
+** 2.x, it will probably always be one. When this value is zero,
30
+** files in the checkout will not be moved by the "mv" command.
31
+**
32
+** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
33
+** the "move-files" setting will be consulted instead of using
34
+** this value.
35
+**
36
+** To retain the Fossil version 1.x behavior when using Fossil 2.x,
37
+** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
38
+** -AND- the "move-files" setting must be set to non-zero.
39
+*/
40
+#ifndef FOSSIL_MV_CHECKOUT_FILE_ON_MV
41
+#define FOSSIL_MV_CHECKOUT_FILE_ON_MV (0)
42
+#endif
43
+
44
+/*
45
+** WARNING: For Fossil version 1.x this value was always zero. For Fossil
46
+** 2.x, it will probably always be one. When this value is zero,
47
+** files in the checkout will not be removed by the "rm" command.
48
+**
49
+** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
50
+** the "remove-files" setting will be consulted instead of using
51
+** this value.
52
+**
53
+** To retain the Fossil version 1.x behavior when using Fossil 2.x,
54
+** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
55
+** -AND- the "move-files" setting must be set to non-zero.
56
+*/
57
+#ifndef FOSSIL_RM_CHECKOUT_FILE_ON_RM
58
+#define FOSSIL_RM_CHECKOUT_FILE_ON_RM (0)
59
+#endif
60
+
2761
 /*
2862
 ** This routine returns the names of files in a working checkout that
2963
 ** are created by Fossil itself, and hence should not be added, deleted,
3064
 ** or merge, and should be omitted from "clean" and "extras" lists.
3165
 **
@@ -393,11 +427,15 @@
393427
 /* We should be done with options.. */
394428
 verify_all_options();
395429
396430
 db_must_be_within_tree();
397431
 db_begin_transaction();
432
+#if FOSSIL_ENABLE_LEGACY_MV_RM
398433
 removeFiles = db_get_boolean("remove-files",0);
434
+#else
435
+ removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
436
+#endif
399437
 if( removeFiles ) init_files_to_remove();
400438
 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
401439
 filename_collation());
402440
 for(i=2; i<g.argc; i++){
403441
 Blob treeName;
@@ -740,11 +778,15 @@
740778
 if( g.argc<4 ){
741779
 usage("OLDNAME NEWNAME");
742780
 }
743781
 zDest = g.argv[g.argc-1];
744782
 db_begin_transaction();
783
+#if FOSSIL_ENABLE_LEGACY_MV_RM
745784
 moveFiles = db_get_boolean("move-files",0);
785
+#else
786
+ moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
787
+#endif
746788
 if( moveFiles ) init_files_to_move();
747789
 file_tree_name(zDest, &dest, 1);
748790
 db_multi_exec(
749791
 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
750792
 );
751793
--- src/add.c
+++ src/add.c
@@ -22,10 +22,44 @@
22 #include "add.h"
23 #include <assert.h>
24 #include <dirent.h>
25 #include "cygsup.h"
26
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27 /*
28 ** This routine returns the names of files in a working checkout that
29 ** are created by Fossil itself, and hence should not be added, deleted,
30 ** or merge, and should be omitted from "clean" and "extras" lists.
31 **
@@ -393,11 +427,15 @@
393 /* We should be done with options.. */
394 verify_all_options();
395
396 db_must_be_within_tree();
397 db_begin_transaction();
 
398 removeFiles = db_get_boolean("remove-files",0);
 
 
 
399 if( removeFiles ) init_files_to_remove();
400 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
401 filename_collation());
402 for(i=2; i<g.argc; i++){
403 Blob treeName;
@@ -740,11 +778,15 @@
740 if( g.argc<4 ){
741 usage("OLDNAME NEWNAME");
742 }
743 zDest = g.argv[g.argc-1];
744 db_begin_transaction();
 
745 moveFiles = db_get_boolean("move-files",0);
 
 
 
746 if( moveFiles ) init_files_to_move();
747 file_tree_name(zDest, &dest, 1);
748 db_multi_exec(
749 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
750 );
751
--- src/add.c
+++ src/add.c
@@ -22,10 +22,44 @@
22 #include "add.h"
23 #include <assert.h>
24 #include <dirent.h>
25 #include "cygsup.h"
26
27 /*
28 ** WARNING: For Fossil version 1.x this value was always zero. For Fossil
29 ** 2.x, it will probably always be one. When this value is zero,
30 ** files in the checkout will not be moved by the "mv" command.
31 **
32 ** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
33 ** the "move-files" setting will be consulted instead of using
34 ** this value.
35 **
36 ** To retain the Fossil version 1.x behavior when using Fossil 2.x,
37 ** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
38 ** -AND- the "move-files" setting must be set to non-zero.
39 */
40 #ifndef FOSSIL_MV_CHECKOUT_FILE_ON_MV
41 #define FOSSIL_MV_CHECKOUT_FILE_ON_MV (0)
42 #endif
43
44 /*
45 ** WARNING: For Fossil version 1.x this value was always zero. For Fossil
46 ** 2.x, it will probably always be one. When this value is zero,
47 ** files in the checkout will not be removed by the "rm" command.
48 **
49 ** If the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option is used,
50 ** the "remove-files" setting will be consulted instead of using
51 ** this value.
52 **
53 ** To retain the Fossil version 1.x behavior when using Fossil 2.x,
54 ** the FOSSIL_ENABLE_LEGACY_MV_RM compile-time option must be used
55 ** -AND- the "move-files" setting must be set to non-zero.
56 */
57 #ifndef FOSSIL_RM_CHECKOUT_FILE_ON_RM
58 #define FOSSIL_RM_CHECKOUT_FILE_ON_RM (0)
59 #endif
60
61 /*
62 ** This routine returns the names of files in a working checkout that
63 ** are created by Fossil itself, and hence should not be added, deleted,
64 ** or merge, and should be omitted from "clean" and "extras" lists.
65 **
@@ -393,11 +427,15 @@
427 /* We should be done with options.. */
428 verify_all_options();
429
430 db_must_be_within_tree();
431 db_begin_transaction();
432 #if FOSSIL_ENABLE_LEGACY_MV_RM
433 removeFiles = db_get_boolean("remove-files",0);
434 #else
435 removeFiles = FOSSIL_RM_CHECKOUT_FILE_ON_RM;
436 #endif
437 if( removeFiles ) init_files_to_remove();
438 db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
439 filename_collation());
440 for(i=2; i<g.argc; i++){
441 Blob treeName;
@@ -740,11 +778,15 @@
778 if( g.argc<4 ){
779 usage("OLDNAME NEWNAME");
780 }
781 zDest = g.argv[g.argc-1];
782 db_begin_transaction();
783 #if FOSSIL_ENABLE_LEGACY_MV_RM
784 moveFiles = db_get_boolean("move-files",0);
785 #else
786 moveFiles = FOSSIL_MV_CHECKOUT_FILE_ON_MV;
787 #endif
788 if( moveFiles ) init_files_to_move();
789 file_tree_name(zDest, &dest, 1);
790 db_multi_exec(
791 "UPDATE vfile SET origname=pathname WHERE origname IS NULL;"
792 );
793
M src/configure.c
+3
--- src/configure.c
+++ src/configure.c
@@ -124,12 +124,15 @@
124124
 { "keep-glob", CONFIGSET_PROJ },
125125
 { "crnl-glob", CONFIGSET_PROJ },
126126
 { "encoding-glob", CONFIGSET_PROJ },
127127
 { "empty-dirs", CONFIGSET_PROJ },
128128
 { "allow-symlinks", CONFIGSET_PROJ },
129
+
130
+#ifdef FOSSIL_ENABLE_LEGACY_MV_RM
129131
 { "move-files", CONFIGSET_PROJ },
130132
 { "remove-files", CONFIGSET_PROJ },
133
+#endif
131134
132135
 { "ticket-table", CONFIGSET_TKT },
133136
 { "ticket-common", CONFIGSET_TKT },
134137
 { "ticket-change", CONFIGSET_TKT },
135138
 { "ticket-newpage", CONFIGSET_TKT },
136139
--- src/configure.c
+++ src/configure.c
@@ -124,12 +124,15 @@
124 { "keep-glob", CONFIGSET_PROJ },
125 { "crnl-glob", CONFIGSET_PROJ },
126 { "encoding-glob", CONFIGSET_PROJ },
127 { "empty-dirs", CONFIGSET_PROJ },
128 { "allow-symlinks", CONFIGSET_PROJ },
 
 
129 { "move-files", CONFIGSET_PROJ },
130 { "remove-files", CONFIGSET_PROJ },
 
131
132 { "ticket-table", CONFIGSET_TKT },
133 { "ticket-common", CONFIGSET_TKT },
134 { "ticket-change", CONFIGSET_TKT },
135 { "ticket-newpage", CONFIGSET_TKT },
136
--- src/configure.c
+++ src/configure.c
@@ -124,12 +124,15 @@
124 { "keep-glob", CONFIGSET_PROJ },
125 { "crnl-glob", CONFIGSET_PROJ },
126 { "encoding-glob", CONFIGSET_PROJ },
127 { "empty-dirs", CONFIGSET_PROJ },
128 { "allow-symlinks", CONFIGSET_PROJ },
129
130 #ifdef FOSSIL_ENABLE_LEGACY_MV_RM
131 { "move-files", CONFIGSET_PROJ },
132 { "remove-files", CONFIGSET_PROJ },
133 #endif
134
135 { "ticket-table", CONFIGSET_TKT },
136 { "ticket-common", CONFIGSET_TKT },
137 { "ticket-change", CONFIGSET_TKT },
138 { "ticket-newpage", CONFIGSET_TKT },
139
M src/db.c
+8 -2
--- src/db.c
+++ src/db.c
@@ -2396,16 +2396,20 @@
23962396
 { "localauth", 0, 0, 0, 0, "off" },
23972397
 { "main-branch", 0, 40, 0, 0, "trunk" },
23982398
 { "manifest", 0, 0, 1, 0, "off" },
23992399
 { "max-loadavg", 0, 25, 0, 0, "0.0" },
24002400
 { "max-upload", 0, 25, 0, 0, "250000" },
2401
+#if FOSSIL_ENABLE_LEGACY_MV_RM
24012402
 { "move-files", 0, 0, 0, 0, "off" },
2403
+#endif
24022404
 { "mtime-changes", 0, 0, 0, 0, "on" },
24032405
 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
24042406
 { "proxy", 0, 32, 0, 0, "off" },
24052407
 { "relative-paths", 0, 0, 0, 0, "on" },
2408
+#if FOSSIL_ENABLE_LEGACY_MV_RM
24062409
 { "remove-files", 0, 0, 0, 0, "off" },
2410
+#endif
24072411
 { "repo-cksum", 0, 0, 0, 0, "on" },
24082412
 { "self-register", 0, 0, 0, 0, "off" },
24092413
 { "ssh-command", 0, 40, 0, 0, "" },
24102414
 { "ssl-ca-location", 0, 40, 0, 0, "" },
24112415
 { "ssl-identity", 0, 40, 0, 0, "" },
@@ -2605,11 +2609,12 @@
26052609
 ** global configuration database.
26062610
 **
26072611
 ** max-upload A limit on the size of uplink HTTP requests. The
26082612
 ** default is 250000 bytes.
26092613
 **
2610
-** move-files If enabled, the "mv" and "rename" commands will also move
2614
+** move-files If enabled (and Fossil was compiled with legacy "mv"
2615
+** support), the "mv" and "rename" commands will also move
26112616
 ** the associated files within the checkout. Default: off.
26122617
 **
26132618
 ** mtime-changes Use file modification times (mtimes) to detect when
26142619
 ** files have been modified. (Default "on".)
26152620
 **
@@ -2622,11 +2627,12 @@
26222627
 ** then a direct HTTP connection is used.
26232628
 **
26242629
 ** relative-paths When showing changes and extras, report paths relative
26252630
 ** to the current working directory. Default: "on"
26262631
 **
2627
-** remove-files If enabled, the "rm" and "delete" commands will also
2632
+** remove-files If enabled (and Fossil was compiled with legacy "rm"
2633
+** support), the "rm" and "delete" commands will also
26282634
 ** remove the associated files from within the checkout.
26292635
 ** Default: off.
26302636
 **
26312637
 ** repo-cksum Compute checksums over all files in each checkout
26322638
 ** as a double-check of correctness. Defaults to "on".
26332639
--- src/db.c
+++ src/db.c
@@ -2396,16 +2396,20 @@
2396 { "localauth", 0, 0, 0, 0, "off" },
2397 { "main-branch", 0, 40, 0, 0, "trunk" },
2398 { "manifest", 0, 0, 1, 0, "off" },
2399 { "max-loadavg", 0, 25, 0, 0, "0.0" },
2400 { "max-upload", 0, 25, 0, 0, "250000" },
 
2401 { "move-files", 0, 0, 0, 0, "off" },
 
2402 { "mtime-changes", 0, 0, 0, 0, "on" },
2403 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2404 { "proxy", 0, 32, 0, 0, "off" },
2405 { "relative-paths", 0, 0, 0, 0, "on" },
 
2406 { "remove-files", 0, 0, 0, 0, "off" },
 
2407 { "repo-cksum", 0, 0, 0, 0, "on" },
2408 { "self-register", 0, 0, 0, 0, "off" },
2409 { "ssh-command", 0, 40, 0, 0, "" },
2410 { "ssl-ca-location", 0, 40, 0, 0, "" },
2411 { "ssl-identity", 0, 40, 0, 0, "" },
@@ -2605,11 +2609,12 @@
2605 ** global configuration database.
2606 **
2607 ** max-upload A limit on the size of uplink HTTP requests. The
2608 ** default is 250000 bytes.
2609 **
2610 ** move-files If enabled, the "mv" and "rename" commands will also move
 
2611 ** the associated files within the checkout. Default: off.
2612 **
2613 ** mtime-changes Use file modification times (mtimes) to detect when
2614 ** files have been modified. (Default "on".)
2615 **
@@ -2622,11 +2627,12 @@
2622 ** then a direct HTTP connection is used.
2623 **
2624 ** relative-paths When showing changes and extras, report paths relative
2625 ** to the current working directory. Default: "on"
2626 **
2627 ** remove-files If enabled, the "rm" and "delete" commands will also
 
2628 ** remove the associated files from within the checkout.
2629 ** Default: off.
2630 **
2631 ** repo-cksum Compute checksums over all files in each checkout
2632 ** as a double-check of correctness. Defaults to "on".
2633
--- src/db.c
+++ src/db.c
@@ -2396,16 +2396,20 @@
2396 { "localauth", 0, 0, 0, 0, "off" },
2397 { "main-branch", 0, 40, 0, 0, "trunk" },
2398 { "manifest", 0, 0, 1, 0, "off" },
2399 { "max-loadavg", 0, 25, 0, 0, "0.0" },
2400 { "max-upload", 0, 25, 0, 0, "250000" },
2401 #if FOSSIL_ENABLE_LEGACY_MV_RM
2402 { "move-files", 0, 0, 0, 0, "off" },
2403 #endif
2404 { "mtime-changes", 0, 0, 0, 0, "on" },
2405 { "pgp-command", 0, 40, 0, 0, "gpg --clearsign -o " },
2406 { "proxy", 0, 32, 0, 0, "off" },
2407 { "relative-paths", 0, 0, 0, 0, "on" },
2408 #if FOSSIL_ENABLE_LEGACY_MV_RM
2409 { "remove-files", 0, 0, 0, 0, "off" },
2410 #endif
2411 { "repo-cksum", 0, 0, 0, 0, "on" },
2412 { "self-register", 0, 0, 0, 0, "off" },
2413 { "ssh-command", 0, 40, 0, 0, "" },
2414 { "ssl-ca-location", 0, 40, 0, 0, "" },
2415 { "ssl-identity", 0, 40, 0, 0, "" },
@@ -2605,11 +2609,12 @@
2609 ** global configuration database.
2610 **
2611 ** max-upload A limit on the size of uplink HTTP requests. The
2612 ** default is 250000 bytes.
2613 **
2614 ** move-files If enabled (and Fossil was compiled with legacy "mv"
2615 ** support), the "mv" and "rename" commands will also move
2616 ** the associated files within the checkout. Default: off.
2617 **
2618 ** mtime-changes Use file modification times (mtimes) to detect when
2619 ** files have been modified. (Default "on".)
2620 **
@@ -2622,11 +2627,12 @@
2627 ** then a direct HTTP connection is used.
2628 **
2629 ** relative-paths When showing changes and extras, report paths relative
2630 ** to the current working directory. Default: "on"
2631 **
2632 ** remove-files If enabled (and Fossil was compiled with legacy "rm"
2633 ** support), the "rm" and "delete" commands will also
2634 ** remove the associated files from within the checkout.
2635 ** Default: off.
2636 **
2637 ** repo-cksum Compute checksums over all files in each checkout
2638 ** as a double-check of correctness. Defaults to "on".
2639
M src/main.c
+3
--- src/main.c
+++ src/main.c
@@ -1007,10 +1007,13 @@
10071007
 #else
10081008
 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
10091009
 #endif
10101010
 #if defined(FOSSIL_ENABLE_SSL)
10111011
 fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
1012
+#endif
1013
+#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
1014
+ fossil_print("LEGACY_MV_RM\n");
10121015
 #endif
10131016
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
10141017
 fossil_print("TH1_DOCS\n");
10151018
 #endif
10161019
 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
10171020
--- src/main.c
+++ src/main.c
@@ -1007,10 +1007,13 @@
1007 #else
1008 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
1009 #endif
1010 #if defined(FOSSIL_ENABLE_SSL)
1011 fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
 
 
 
1012 #endif
1013 #if defined(FOSSIL_ENABLE_TH1_DOCS)
1014 fossil_print("TH1_DOCS\n");
1015 #endif
1016 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
1017
--- src/main.c
+++ src/main.c
@@ -1007,10 +1007,13 @@
1007 #else
1008 fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
1009 #endif
1010 #if defined(FOSSIL_ENABLE_SSL)
1011 fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
1012 #endif
1013 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
1014 fossil_print("LEGACY_MV_RM\n");
1015 #endif
1016 #if defined(FOSSIL_ENABLE_TH1_DOCS)
1017 fossil_print("TH1_DOCS\n");
1018 #endif
1019 #if defined(FOSSIL_ENABLE_TH1_HOOKS)
1020
M src/makemake.tcl
+18
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -493,10 +493,14 @@
493493
494494
 #### Automatically build OpenSSL when building Fossil (causes rebuild
495495
 # issues when building incrementally).
496496
 #
497497
 # FOSSIL_BUILD_SSL = 1
498
+
499
+#### Enable legacy treatment of mv/rm (skip checkout files)
500
+#
501
+# FOSSIL_ENABLE_LEGACY_MV_RM = 1
498502
499503
 #### Enable TH1 scripts in embedded documentation files
500504
 #
501505
 # FOSSIL_ENABLE_TH1_DOCS = 1
502506
@@ -692,10 +696,16 @@
692696
 # With HTTPS support
693697
 ifdef FOSSIL_ENABLE_SSL
694698
 TCC += -DFOSSIL_ENABLE_SSL=1
695699
 RCC += -DFOSSIL_ENABLE_SSL=1
696700
 endif
701
+
702
+# With legacy treatment of mv/rm
703
+ifdef FOSSIL_ENABLE_LEGACY_MV_RM
704
+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
705
+RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
706
+endif
697707
698708
 # With TH1 embedded docs support
699709
 ifdef FOSSIL_ENABLE_TH1_DOCS
700710
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
701711
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
@@ -1309,10 +1319,13 @@
13091319
 # Uncomment to enable SSL support
13101320
 # FOSSIL_ENABLE_SSL = 1
13111321
13121322
 # Uncomment to build SSL libraries
13131323
 # FOSSIL_BUILD_SSL = 1
1324
+
1325
+# Uncomment to enable legacy treatment of mv/rm
1326
+# FOSSIL_ENABLE_LEGACY_MV_RM = 1
13141327
13151328
 # Uncomment to enable TH1 scripts in embedded documentation files
13161329
 # FOSSIL_ENABLE_TH1_DOCS = 1
13171330
13181331
 # Uncomment to enable TH1 hooks
@@ -1425,10 +1438,15 @@
14251438
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
14261439
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
14271440
 LIBS = $(LIBS) $(SSLLIB)
14281441
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
14291442
 !endif
1443
+
1444
+!ifdef FOSSIL_ENABLE_LEGACY_MV_RM
1445
+TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1446
+RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1447
+!endif
14301448
14311449
 !ifdef FOSSIL_ENABLE_TH1_DOCS
14321450
 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
14331451
 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
14341452
 !endif
14351453
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -493,10 +493,14 @@
493
494 #### Automatically build OpenSSL when building Fossil (causes rebuild
495 # issues when building incrementally).
496 #
497 # FOSSIL_BUILD_SSL = 1
 
 
 
 
498
499 #### Enable TH1 scripts in embedded documentation files
500 #
501 # FOSSIL_ENABLE_TH1_DOCS = 1
502
@@ -692,10 +696,16 @@
692 # With HTTPS support
693 ifdef FOSSIL_ENABLE_SSL
694 TCC += -DFOSSIL_ENABLE_SSL=1
695 RCC += -DFOSSIL_ENABLE_SSL=1
696 endif
 
 
 
 
 
 
697
698 # With TH1 embedded docs support
699 ifdef FOSSIL_ENABLE_TH1_DOCS
700 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
701 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
@@ -1309,10 +1319,13 @@
1309 # Uncomment to enable SSL support
1310 # FOSSIL_ENABLE_SSL = 1
1311
1312 # Uncomment to build SSL libraries
1313 # FOSSIL_BUILD_SSL = 1
 
 
 
1314
1315 # Uncomment to enable TH1 scripts in embedded documentation files
1316 # FOSSIL_ENABLE_TH1_DOCS = 1
1317
1318 # Uncomment to enable TH1 hooks
@@ -1425,10 +1438,15 @@
1425 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1426 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1427 LIBS = $(LIBS) $(SSLLIB)
1428 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1429 !endif
 
 
 
 
 
1430
1431 !ifdef FOSSIL_ENABLE_TH1_DOCS
1432 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1433 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1434 !endif
1435
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -493,10 +493,14 @@
493
494 #### Automatically build OpenSSL when building Fossil (causes rebuild
495 # issues when building incrementally).
496 #
497 # FOSSIL_BUILD_SSL = 1
498
499 #### Enable legacy treatment of mv/rm (skip checkout files)
500 #
501 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
502
503 #### Enable TH1 scripts in embedded documentation files
504 #
505 # FOSSIL_ENABLE_TH1_DOCS = 1
506
@@ -692,10 +696,16 @@
696 # With HTTPS support
697 ifdef FOSSIL_ENABLE_SSL
698 TCC += -DFOSSIL_ENABLE_SSL=1
699 RCC += -DFOSSIL_ENABLE_SSL=1
700 endif
701
702 # With legacy treatment of mv/rm
703 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
704 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
705 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
706 endif
707
708 # With TH1 embedded docs support
709 ifdef FOSSIL_ENABLE_TH1_DOCS
710 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
711 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
@@ -1309,10 +1319,13 @@
1319 # Uncomment to enable SSL support
1320 # FOSSIL_ENABLE_SSL = 1
1321
1322 # Uncomment to build SSL libraries
1323 # FOSSIL_BUILD_SSL = 1
1324
1325 # Uncomment to enable legacy treatment of mv/rm
1326 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
1327
1328 # Uncomment to enable TH1 scripts in embedded documentation files
1329 # FOSSIL_ENABLE_TH1_DOCS = 1
1330
1331 # Uncomment to enable TH1 hooks
@@ -1425,10 +1438,15 @@
1438 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1439 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1440 LIBS = $(LIBS) $(SSLLIB)
1441 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1442 !endif
1443
1444 !ifdef FOSSIL_ENABLE_LEGACY_MV_RM
1445 TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1446 RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
1447 !endif
1448
1449 !ifdef FOSSIL_ENABLE_TH1_DOCS
1450 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1451 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
1452 !endif
1453
M src/th_main.c
+6
--- src/th_main.c
+++ src/th_main.c
@@ -505,10 +505,11 @@
505505
 **
506506
 ** Return true if the fossil binary has the given compile-time feature
507507
 ** enabled. The set of features includes:
508508
 **
509509
 ** "ssl" = FOSSIL_ENABLE_SSL
510
+** "legacyMvRm" = FOSSIL_ENABLE_LEGACY_MV_RM
510511
 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
511512
 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
512513
 ** "tcl" = FOSSIL_ENABLE_TCL
513514
 ** "useTclStubs" = USE_TCL_STUBS
514515
 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
@@ -535,10 +536,15 @@
535536
 }
536537
 #if defined(FOSSIL_ENABLE_SSL)
537538
 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
538539
 rc = 1;
539540
 }
541
+#endif
542
+#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
543
+ else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
544
+ rc = 1;
545
+ }
540546
 #endif
541547
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
542548
 else if( 0 == fossil_strnicmp( zArg, "th1Docs\0", 8 ) ){
543549
 rc = 1;
544550
 }
545551
--- src/th_main.c
+++ src/th_main.c
@@ -505,10 +505,11 @@
505 **
506 ** Return true if the fossil binary has the given compile-time feature
507 ** enabled. The set of features includes:
508 **
509 ** "ssl" = FOSSIL_ENABLE_SSL
 
510 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
511 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
512 ** "tcl" = FOSSIL_ENABLE_TCL
513 ** "useTclStubs" = USE_TCL_STUBS
514 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
@@ -535,10 +536,15 @@
535 }
536 #if defined(FOSSIL_ENABLE_SSL)
537 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
538 rc = 1;
539 }
 
 
 
 
 
540 #endif
541 #if defined(FOSSIL_ENABLE_TH1_DOCS)
542 else if( 0 == fossil_strnicmp( zArg, "th1Docs\0", 8 ) ){
543 rc = 1;
544 }
545
--- src/th_main.c
+++ src/th_main.c
@@ -505,10 +505,11 @@
505 **
506 ** Return true if the fossil binary has the given compile-time feature
507 ** enabled. The set of features includes:
508 **
509 ** "ssl" = FOSSIL_ENABLE_SSL
510 ** "legacyMvRm" = FOSSIL_ENABLE_LEGACY_MV_RM
511 ** "th1Docs" = FOSSIL_ENABLE_TH1_DOCS
512 ** "th1Hooks" = FOSSIL_ENABLE_TH1_HOOKS
513 ** "tcl" = FOSSIL_ENABLE_TCL
514 ** "useTclStubs" = USE_TCL_STUBS
515 ** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
@@ -535,10 +536,15 @@
536 }
537 #if defined(FOSSIL_ENABLE_SSL)
538 else if( 0 == fossil_strnicmp( zArg, "ssl\0", 4 ) ){
539 rc = 1;
540 }
541 #endif
542 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
543 else if( 0 == fossil_strnicmp( zArg, "legacyMvRm\0", 11 ) ){
544 rc = 1;
545 }
546 #endif
547 #if defined(FOSSIL_ENABLE_TH1_DOCS)
548 else if( 0 == fossil_strnicmp( zArg, "th1Docs\0", 8 ) ){
549 rc = 1;
550 }
551
M win/Makefile.mingw
+10
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,10 +52,14 @@
5252
5353
 #### Automatically build OpenSSL when building Fossil (causes rebuild
5454
 # issues when building incrementally).
5555
 #
5656
 # FOSSIL_BUILD_SSL = 1
57
+
58
+#### Enable legacy treatment of mv/rm (skip checkout files)
59
+#
60
+# FOSSIL_ENABLE_LEGACY_MV_RM = 1
5761
5862
 #### Enable TH1 scripts in embedded documentation files
5963
 #
6064
 # FOSSIL_ENABLE_TH1_DOCS = 1
6165
@@ -251,10 +255,16 @@
251255
 # With HTTPS support
252256
 ifdef FOSSIL_ENABLE_SSL
253257
 TCC += -DFOSSIL_ENABLE_SSL=1
254258
 RCC += -DFOSSIL_ENABLE_SSL=1
255259
 endif
260
+
261
+# With legacy treatment of mv/rm
262
+ifdef FOSSIL_ENABLE_LEGACY_MV_RM
263
+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
264
+RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
265
+endif
256266
257267
 # With TH1 embedded docs support
258268
 ifdef FOSSIL_ENABLE_TH1_DOCS
259269
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
260270
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
261271
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,10 +52,14 @@
52
53 #### Automatically build OpenSSL when building Fossil (causes rebuild
54 # issues when building incrementally).
55 #
56 # FOSSIL_BUILD_SSL = 1
 
 
 
 
57
58 #### Enable TH1 scripts in embedded documentation files
59 #
60 # FOSSIL_ENABLE_TH1_DOCS = 1
61
@@ -251,10 +255,16 @@
251 # With HTTPS support
252 ifdef FOSSIL_ENABLE_SSL
253 TCC += -DFOSSIL_ENABLE_SSL=1
254 RCC += -DFOSSIL_ENABLE_SSL=1
255 endif
 
 
 
 
 
 
256
257 # With TH1 embedded docs support
258 ifdef FOSSIL_ENABLE_TH1_DOCS
259 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
260 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
261
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,10 +52,14 @@
52
53 #### Automatically build OpenSSL when building Fossil (causes rebuild
54 # issues when building incrementally).
55 #
56 # FOSSIL_BUILD_SSL = 1
57
58 #### Enable legacy treatment of mv/rm (skip checkout files)
59 #
60 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
61
62 #### Enable TH1 scripts in embedded documentation files
63 #
64 # FOSSIL_ENABLE_TH1_DOCS = 1
65
@@ -251,10 +255,16 @@
255 # With HTTPS support
256 ifdef FOSSIL_ENABLE_SSL
257 TCC += -DFOSSIL_ENABLE_SSL=1
258 RCC += -DFOSSIL_ENABLE_SSL=1
259 endif
260
261 # With legacy treatment of mv/rm
262 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
263 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
264 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
265 endif
266
267 # With TH1 embedded docs support
268 ifdef FOSSIL_ENABLE_TH1_DOCS
269 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
270 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
271
M win/Makefile.mingw.mistachkin
+10
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -52,10 +52,14 @@
5252
5353
 #### Automatically build OpenSSL when building Fossil (causes rebuild
5454
 # issues when building incrementally).
5555
 #
5656
 # FOSSIL_BUILD_SSL = 1
57
+
58
+#### Enable legacy treatment of mv/rm (skip checkout files)
59
+#
60
+FOSSIL_ENABLE_LEGACY_MV_RM = 1
5761
5862
 #### Enable TH1 scripts in embedded documentation files
5963
 #
6064
 # FOSSIL_ENABLE_TH1_DOCS = 1
6165
@@ -251,10 +255,16 @@
251255
 # With HTTPS support
252256
 ifdef FOSSIL_ENABLE_SSL
253257
 TCC += -DFOSSIL_ENABLE_SSL=1
254258
 RCC += -DFOSSIL_ENABLE_SSL=1
255259
 endif
260
+
261
+# With legacy treatment of mv/rm
262
+ifdef FOSSIL_ENABLE_LEGACY_MV_RM
263
+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
264
+RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
265
+endif
256266
257267
 # With TH1 embedded docs support
258268
 ifdef FOSSIL_ENABLE_TH1_DOCS
259269
 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
260270
 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
261271
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -52,10 +52,14 @@
52
53 #### Automatically build OpenSSL when building Fossil (causes rebuild
54 # issues when building incrementally).
55 #
56 # FOSSIL_BUILD_SSL = 1
 
 
 
 
57
58 #### Enable TH1 scripts in embedded documentation files
59 #
60 # FOSSIL_ENABLE_TH1_DOCS = 1
61
@@ -251,10 +255,16 @@
251 # With HTTPS support
252 ifdef FOSSIL_ENABLE_SSL
253 TCC += -DFOSSIL_ENABLE_SSL=1
254 RCC += -DFOSSIL_ENABLE_SSL=1
255 endif
 
 
 
 
 
 
256
257 # With TH1 embedded docs support
258 ifdef FOSSIL_ENABLE_TH1_DOCS
259 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
260 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
261
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -52,10 +52,14 @@
52
53 #### Automatically build OpenSSL when building Fossil (causes rebuild
54 # issues when building incrementally).
55 #
56 # FOSSIL_BUILD_SSL = 1
57
58 #### Enable legacy treatment of mv/rm (skip checkout files)
59 #
60 FOSSIL_ENABLE_LEGACY_MV_RM = 1
61
62 #### Enable TH1 scripts in embedded documentation files
63 #
64 # FOSSIL_ENABLE_TH1_DOCS = 1
65
@@ -251,10 +255,16 @@
255 # With HTTPS support
256 ifdef FOSSIL_ENABLE_SSL
257 TCC += -DFOSSIL_ENABLE_SSL=1
258 RCC += -DFOSSIL_ENABLE_SSL=1
259 endif
260
261 # With legacy treatment of mv/rm
262 ifdef FOSSIL_ENABLE_LEGACY_MV_RM
263 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
264 RCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
265 endif
266
267 # With TH1 embedded docs support
268 ifdef FOSSIL_ENABLE_TH1_DOCS
269 TCC += -DFOSSIL_ENABLE_TH1_DOCS=1
270 RCC += -DFOSSIL_ENABLE_TH1_DOCS=1
271
M win/Makefile.msc
+8
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -44,10 +44,13 @@
4444
 # Uncomment to enable SSL support
4545
 # FOSSIL_ENABLE_SSL = 1
4646
4747
 # Uncomment to build SSL libraries
4848
 # FOSSIL_BUILD_SSL = 1
49
+
50
+# Uncomment to enable legacy treatment of mv/rm
51
+# FOSSIL_ENABLE_LEGACY_MV_RM = 1
4952
5053
 # Uncomment to enable TH1 scripts in embedded documentation files
5154
 # FOSSIL_ENABLE_TH1_DOCS = 1
5255
5356
 # Uncomment to enable TH1 hooks
@@ -160,10 +163,15 @@
160163
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
161164
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
162165
 LIBS = $(LIBS) $(SSLLIB)
163166
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
164167
 !endif
168
+
169
+!ifdef FOSSIL_ENABLE_LEGACY_MV_RM
170
+TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
171
+RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
172
+!endif
165173
166174
 !ifdef FOSSIL_ENABLE_TH1_DOCS
167175
 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
168176
 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
169177
 !endif
170178
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -44,10 +44,13 @@
44 # Uncomment to enable SSL support
45 # FOSSIL_ENABLE_SSL = 1
46
47 # Uncomment to build SSL libraries
48 # FOSSIL_BUILD_SSL = 1
 
 
 
49
50 # Uncomment to enable TH1 scripts in embedded documentation files
51 # FOSSIL_ENABLE_TH1_DOCS = 1
52
53 # Uncomment to enable TH1 hooks
@@ -160,10 +163,15 @@
160 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
161 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
162 LIBS = $(LIBS) $(SSLLIB)
163 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
164 !endif
 
 
 
 
 
165
166 !ifdef FOSSIL_ENABLE_TH1_DOCS
167 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
168 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
169 !endif
170
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -44,10 +44,13 @@
44 # Uncomment to enable SSL support
45 # FOSSIL_ENABLE_SSL = 1
46
47 # Uncomment to build SSL libraries
48 # FOSSIL_BUILD_SSL = 1
49
50 # Uncomment to enable legacy treatment of mv/rm
51 # FOSSIL_ENABLE_LEGACY_MV_RM = 1
52
53 # Uncomment to enable TH1 scripts in embedded documentation files
54 # FOSSIL_ENABLE_TH1_DOCS = 1
55
56 # Uncomment to enable TH1 hooks
@@ -160,10 +163,15 @@
163 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
164 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
165 LIBS = $(LIBS) $(SSLLIB)
166 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
167 !endif
168
169 !ifdef FOSSIL_ENABLE_LEGACY_MV_RM
170 TCC = $(TCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
171 RCC = $(RCC) /DFOSSIL_ENABLE_LEGACY_MV_RM=1
172 !endif
173
174 !ifdef FOSSIL_ENABLE_TH1_DOCS
175 TCC = $(TCC) /DFOSSIL_ENABLE_TH1_DOCS=1
176 RCC = $(RCC) /DFOSSIL_ENABLE_TH1_DOCS=1
177 !endif
178
M win/fossil.rc
+5
--- win/fossil.rc
+++ win/fossil.rc
@@ -115,10 +115,15 @@
115115
 VALUE "CommandLineIsUnicode", "Yes\0"
116116
 #endif /* defined(BROKEN_MINGW_CMDLINE) */
117117
 #if defined(FOSSIL_ENABLE_SSL)
118118
 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
119119
 #endif /* defined(FOSSIL_ENABLE_SSL) */
120
+#if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
121
+ VALUE "LegacyMvRm", "Yes\0"
122
+#else
123
+ VALUE "LegacyMvRm", "No\0"
124
+#endif /* defined(FOSSIL_ENABLE_LEGACY_MV_RM) */
120125
 #if defined(FOSSIL_ENABLE_TH1_DOCS)
121126
 VALUE "Th1Docs", "Yes\0"
122127
 #else
123128
 VALUE "Th1Docs", "No\0"
124129
 #endif /* defined(FOSSIL_ENABLE_TH1_DOCS) */
125130
--- win/fossil.rc
+++ win/fossil.rc
@@ -115,10 +115,15 @@
115 VALUE "CommandLineIsUnicode", "Yes\0"
116 #endif /* defined(BROKEN_MINGW_CMDLINE) */
117 #if defined(FOSSIL_ENABLE_SSL)
118 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
119 #endif /* defined(FOSSIL_ENABLE_SSL) */
 
 
 
 
 
120 #if defined(FOSSIL_ENABLE_TH1_DOCS)
121 VALUE "Th1Docs", "Yes\0"
122 #else
123 VALUE "Th1Docs", "No\0"
124 #endif /* defined(FOSSIL_ENABLE_TH1_DOCS) */
125
--- win/fossil.rc
+++ win/fossil.rc
@@ -115,10 +115,15 @@
115 VALUE "CommandLineIsUnicode", "Yes\0"
116 #endif /* defined(BROKEN_MINGW_CMDLINE) */
117 #if defined(FOSSIL_ENABLE_SSL)
118 VALUE "SslEnabled", "Yes, " OPENSSL_VERSION_TEXT "\0"
119 #endif /* defined(FOSSIL_ENABLE_SSL) */
120 #if defined(FOSSIL_ENABLE_LEGACY_MV_RM)
121 VALUE "LegacyMvRm", "Yes\0"
122 #else
123 VALUE "LegacyMvRm", "No\0"
124 #endif /* defined(FOSSIL_ENABLE_LEGACY_MV_RM) */
125 #if defined(FOSSIL_ENABLE_TH1_DOCS)
126 VALUE "Th1Docs", "Yes\0"
127 #else
128 VALUE "Th1Docs", "No\0"
129 #endif /* defined(FOSSIL_ENABLE_TH1_DOCS) */
130

Keyboard Shortcuts

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