Fossil SCM

Minor updates to the build system, et al, for 'mman.h' support.

mistachkin 2018-03-17 20:51 withMman
Commit 142218827c47309cdc5e884668f33495015fb09049574d38743ca7bb874106b2
+2 -2
--- auto.def
+++ auto.def
@@ -15,11 +15,11 @@
1515
with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1616
with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1717
with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1818
with-tcl-private-stubs=0
1919
=> {Enable Tcl integration via private stubs mechanism}
20
- with-mman=0 => {Enable use of POSIX memory APIs from mman.h}
20
+ with-mman=0 => {Enable use of POSIX memory APIs from "sys/mman.h"}
2121
with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
2222
internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
2323
static=0 => {Link a static executable}
2424
fusefs=1 => {Disable the Fuse Filesystem}
2525
fossil-debug=0 => {Build with fossil debugging enabled}
@@ -147,11 +147,11 @@
147147
}
148148
149149
if {[opt-bool with-mman]} {
150150
define-append EXTRA_CFLAGS -DUSE_MMAN_H
151151
define USE_MMAN_H 1
152
- msg-result "Enabling \"mman.h\" support"
152
+ msg-result "Enabling \"sys/mman.h\" support"
153153
}
154154
155155
if {[opt-bool with-see]} {
156156
define-append EXTRA_CFLAGS -DUSE_SEE
157157
define USE_SEE 1
158158
--- auto.def
+++ auto.def
@@ -15,11 +15,11 @@
15 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
17 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
18 with-tcl-private-stubs=0
19 => {Enable Tcl integration via private stubs mechanism}
20 with-mman=0 => {Enable use of POSIX memory APIs from mman.h}
21 with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
22 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
23 static=0 => {Link a static executable}
24 fusefs=1 => {Disable the Fuse Filesystem}
25 fossil-debug=0 => {Build with fossil debugging enabled}
@@ -147,11 +147,11 @@
147 }
148
149 if {[opt-bool with-mman]} {
150 define-append EXTRA_CFLAGS -DUSE_MMAN_H
151 define USE_MMAN_H 1
152 msg-result "Enabling \"mman.h\" support"
153 }
154
155 if {[opt-bool with-see]} {
156 define-append EXTRA_CFLAGS -DUSE_SEE
157 define USE_SEE 1
158
--- auto.def
+++ auto.def
@@ -15,11 +15,11 @@
15 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
17 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
18 with-tcl-private-stubs=0
19 => {Enable Tcl integration via private stubs mechanism}
20 with-mman=0 => {Enable use of POSIX memory APIs from "sys/mman.h"}
21 with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
22 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
23 static=0 => {Link a static executable}
24 fusefs=1 => {Disable the Fuse Filesystem}
25 fossil-debug=0 => {Build with fossil debugging enabled}
@@ -147,11 +147,11 @@
147 }
148
149 if {[opt-bool with-mman]} {
150 define-append EXTRA_CFLAGS -DUSE_MMAN_H
151 define USE_MMAN_H 1
152 msg-result "Enabling \"sys/mman.h\" support"
153 }
154
155 if {[opt-bool with-see]} {
156 define-append EXTRA_CFLAGS -DUSE_SEE
157 define USE_SEE 1
158
+3
--- src/main.c
+++ src/main.c
@@ -992,10 +992,13 @@
992992
blob_append(pOut, "FOSSIL_STATIC_BUILD\n", -1);
993993
#endif
994994
#if defined(HAVE_PLEDGE)
995995
blob_append(pOut, "HAVE_PLEDGE\n", -1);
996996
#endif
997
+#if defined(USE_MMAN_H)
998
+ blob_append(pOut, "USE_MMAN_H\n", -1);
999
+#endif
9971000
#if defined(USE_SEE)
9981001
blob_append(pOut, "USE_SEE\n", -1);
9991002
#endif
10001003
#if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
10011004
blob_append(pOut, "FOSSIL_ALLOW_OUT_OF_ORDER_DATES\n");
10021005
--- src/main.c
+++ src/main.c
@@ -992,10 +992,13 @@
992 blob_append(pOut, "FOSSIL_STATIC_BUILD\n", -1);
993 #endif
994 #if defined(HAVE_PLEDGE)
995 blob_append(pOut, "HAVE_PLEDGE\n", -1);
996 #endif
 
 
 
997 #if defined(USE_SEE)
998 blob_append(pOut, "USE_SEE\n", -1);
999 #endif
1000 #if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
1001 blob_append(pOut, "FOSSIL_ALLOW_OUT_OF_ORDER_DATES\n");
1002
--- src/main.c
+++ src/main.c
@@ -992,10 +992,13 @@
992 blob_append(pOut, "FOSSIL_STATIC_BUILD\n", -1);
993 #endif
994 #if defined(HAVE_PLEDGE)
995 blob_append(pOut, "HAVE_PLEDGE\n", -1);
996 #endif
997 #if defined(USE_MMAN_H)
998 blob_append(pOut, "USE_MMAN_H\n", -1);
999 #endif
1000 #if defined(USE_SEE)
1001 blob_append(pOut, "USE_SEE\n", -1);
1002 #endif
1003 #if defined(FOSSIL_ALLOW_OUT_OF_ORDER_DATES)
1004 blob_append(pOut, "FOSSIL_ALLOW_OUT_OF_ORDER_DATES\n");
1005
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -623,10 +623,14 @@
623623
# FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
624624
625625
#### Use 'system' SQLite
626626
#
627627
# USE_SYSTEM_SQLITE = 1
628
+
629
+#### Use POSIX memory APIs from "sys/mman.h"
630
+#
631
+# USE_MMAN_H = 1
628632
629633
#### Use the SQLite Encryption Extension
630634
#
631635
# USE_SEE = 1
632636
@@ -860,10 +864,16 @@
860864
# With JSON support
861865
ifdef FOSSIL_ENABLE_JSON
862866
TCC += -DFOSSIL_ENABLE_JSON=1
863867
RCC += -DFOSSIL_ENABLE_JSON=1
864868
endif
869
+
870
+# With "sys/mman.h" support
871
+ifdef USE_MMAN_H
872
+TCC += -DUSE_MMAN_H=1
873
+RCC += -DUSE_MMAN_H=1
874
+endif
865875
866876
# With SQLite Encryption Extension support
867877
ifdef USE_SEE
868878
TCC += -DUSE_SEE=1
869879
RCC += -DUSE_SEE=1
870880
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -623,10 +623,14 @@
623 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
624
625 #### Use 'system' SQLite
626 #
627 # USE_SYSTEM_SQLITE = 1
 
 
 
 
628
629 #### Use the SQLite Encryption Extension
630 #
631 # USE_SEE = 1
632
@@ -860,10 +864,16 @@
860 # With JSON support
861 ifdef FOSSIL_ENABLE_JSON
862 TCC += -DFOSSIL_ENABLE_JSON=1
863 RCC += -DFOSSIL_ENABLE_JSON=1
864 endif
 
 
 
 
 
 
865
866 # With SQLite Encryption Extension support
867 ifdef USE_SEE
868 TCC += -DUSE_SEE=1
869 RCC += -DUSE_SEE=1
870
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -623,10 +623,14 @@
623 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
624
625 #### Use 'system' SQLite
626 #
627 # USE_SYSTEM_SQLITE = 1
628
629 #### Use POSIX memory APIs from "sys/mman.h"
630 #
631 # USE_MMAN_H = 1
632
633 #### Use the SQLite Encryption Extension
634 #
635 # USE_SEE = 1
636
@@ -860,10 +864,16 @@
864 # With JSON support
865 ifdef FOSSIL_ENABLE_JSON
866 TCC += -DFOSSIL_ENABLE_JSON=1
867 RCC += -DFOSSIL_ENABLE_JSON=1
868 endif
869
870 # With "sys/mman.h" support
871 ifdef USE_MMAN_H
872 TCC += -DUSE_MMAN_H=1
873 RCC += -DUSE_MMAN_H=1
874 endif
875
876 # With SQLite Encryption Extension support
877 ifdef USE_SEE
878 TCC += -DUSE_SEE=1
879 RCC += -DUSE_SEE=1
880
--- src/th_main.c
+++ src/th_main.c
@@ -749,10 +749,11 @@
749749
** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS
750750
** "json" = FOSSIL_ENABLE_JSON
751751
** "markdown" = FOSSIL_ENABLE_MARKDOWN
752752
** "unicodeCmdLine" = !BROKEN_MINGW_CMDLINE
753753
** "dynamicBuild" = FOSSIL_DYNAMIC_BUILD
754
+** "mman" = USE_MMAN_H
754755
** "see" = USE_SEE
755756
**
756757
** Specifying an unknown feature will return a value of false, it will not
757758
** raise a script error.
758759
*/
@@ -829,10 +830,15 @@
829830
#endif
830831
#if defined(FOSSIL_DYNAMIC_BUILD)
831832
else if( 0 == fossil_strnicmp( zArg, "dynamicBuild\0", 13 ) ){
832833
rc = 1;
833834
}
835
+#endif
836
+#if defined(USE_MMAN_H)
837
+ else if( 0 == fossil_strnicmp( zArg, "mman\0", 5 ) ){
838
+ rc = 1;
839
+ }
834840
#endif
835841
#if defined(USE_SEE)
836842
else if( 0 == fossil_strnicmp( zArg, "see\0", 4 ) ){
837843
rc = 1;
838844
}
839845
--- src/th_main.c
+++ src/th_main.c
@@ -749,10 +749,11 @@
749 ** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS
750 ** "json" = FOSSIL_ENABLE_JSON
751 ** "markdown" = FOSSIL_ENABLE_MARKDOWN
752 ** "unicodeCmdLine" = !BROKEN_MINGW_CMDLINE
753 ** "dynamicBuild" = FOSSIL_DYNAMIC_BUILD
 
754 ** "see" = USE_SEE
755 **
756 ** Specifying an unknown feature will return a value of false, it will not
757 ** raise a script error.
758 */
@@ -829,10 +830,15 @@
829 #endif
830 #if defined(FOSSIL_DYNAMIC_BUILD)
831 else if( 0 == fossil_strnicmp( zArg, "dynamicBuild\0", 13 ) ){
832 rc = 1;
833 }
 
 
 
 
 
834 #endif
835 #if defined(USE_SEE)
836 else if( 0 == fossil_strnicmp( zArg, "see\0", 4 ) ){
837 rc = 1;
838 }
839
--- src/th_main.c
+++ src/th_main.c
@@ -749,10 +749,11 @@
749 ** "tclPrivateStubs" = FOSSIL_ENABLE_TCL_PRIVATE_STUBS
750 ** "json" = FOSSIL_ENABLE_JSON
751 ** "markdown" = FOSSIL_ENABLE_MARKDOWN
752 ** "unicodeCmdLine" = !BROKEN_MINGW_CMDLINE
753 ** "dynamicBuild" = FOSSIL_DYNAMIC_BUILD
754 ** "mman" = USE_MMAN_H
755 ** "see" = USE_SEE
756 **
757 ** Specifying an unknown feature will return a value of false, it will not
758 ** raise a script error.
759 */
@@ -829,10 +830,15 @@
830 #endif
831 #if defined(FOSSIL_DYNAMIC_BUILD)
832 else if( 0 == fossil_strnicmp( zArg, "dynamicBuild\0", 13 ) ){
833 rc = 1;
834 }
835 #endif
836 #if defined(USE_MMAN_H)
837 else if( 0 == fossil_strnicmp( zArg, "mman\0", 5 ) ){
838 rc = 1;
839 }
840 #endif
841 #if defined(USE_SEE)
842 else if( 0 == fossil_strnicmp( zArg, "see\0", 4 ) ){
843 rc = 1;
844 }
845
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -96,10 +96,14 @@
9696
# FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
9797
9898
#### Use 'system' SQLite
9999
#
100100
# USE_SYSTEM_SQLITE = 1
101
+
102
+#### Use POSIX memory APIs from "sys/mman.h"
103
+#
104
+# USE_MMAN_H = 1
101105
102106
#### Use the SQLite Encryption Extension
103107
#
104108
# USE_SEE = 1
105109
@@ -333,10 +337,16 @@
333337
# With JSON support
334338
ifdef FOSSIL_ENABLE_JSON
335339
TCC += -DFOSSIL_ENABLE_JSON=1
336340
RCC += -DFOSSIL_ENABLE_JSON=1
337341
endif
342
+
343
+# With "sys/mman.h" support
344
+ifdef USE_MMAN_H
345
+TCC += -DUSE_MMAN_H=1
346
+RCC += -DUSE_MMAN_H=1
347
+endif
338348
339349
# With SQLite Encryption Extension support
340350
ifdef USE_SEE
341351
TCC += -DUSE_SEE=1
342352
RCC += -DUSE_SEE=1
343353
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -96,10 +96,14 @@
96 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
97
98 #### Use 'system' SQLite
99 #
100 # USE_SYSTEM_SQLITE = 1
 
 
 
 
101
102 #### Use the SQLite Encryption Extension
103 #
104 # USE_SEE = 1
105
@@ -333,10 +337,16 @@
333 # With JSON support
334 ifdef FOSSIL_ENABLE_JSON
335 TCC += -DFOSSIL_ENABLE_JSON=1
336 RCC += -DFOSSIL_ENABLE_JSON=1
337 endif
 
 
 
 
 
 
338
339 # With SQLite Encryption Extension support
340 ifdef USE_SEE
341 TCC += -DUSE_SEE=1
342 RCC += -DUSE_SEE=1
343
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -96,10 +96,14 @@
96 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
97
98 #### Use 'system' SQLite
99 #
100 # USE_SYSTEM_SQLITE = 1
101
102 #### Use POSIX memory APIs from "sys/mman.h"
103 #
104 # USE_MMAN_H = 1
105
106 #### Use the SQLite Encryption Extension
107 #
108 # USE_SEE = 1
109
@@ -333,10 +337,16 @@
337 # With JSON support
338 ifdef FOSSIL_ENABLE_JSON
339 TCC += -DFOSSIL_ENABLE_JSON=1
340 RCC += -DFOSSIL_ENABLE_JSON=1
341 endif
342
343 # With "sys/mman.h" support
344 ifdef USE_MMAN_H
345 TCC += -DUSE_MMAN_H=1
346 RCC += -DUSE_MMAN_H=1
347 endif
348
349 # With SQLite Encryption Extension support
350 ifdef USE_SEE
351 TCC += -DUSE_SEE=1
352 RCC += -DUSE_SEE=1
353
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -96,10 +96,14 @@
9696
FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
9797
9898
#### Use 'system' SQLite
9999
#
100100
# USE_SYSTEM_SQLITE = 1
101
+
102
+#### Use POSIX memory APIs from "sys/mman.h"
103
+#
104
+# USE_MMAN_H = 1
101105
102106
#### Use the SQLite Encryption Extension
103107
#
104108
# USE_SEE = 1
105109
@@ -333,10 +337,16 @@
333337
# With JSON support
334338
ifdef FOSSIL_ENABLE_JSON
335339
TCC += -DFOSSIL_ENABLE_JSON=1
336340
RCC += -DFOSSIL_ENABLE_JSON=1
337341
endif
342
+
343
+# With "sys/mman.h" support
344
+ifdef USE_MMAN_H
345
+TCC += -DUSE_MMAN_H=1
346
+RCC += -DUSE_MMAN_H=1
347
+endif
338348
339349
# With SQLite Encryption Extension support
340350
ifdef USE_SEE
341351
TCC += -DUSE_SEE=1
342352
RCC += -DUSE_SEE=1
343353
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -96,10 +96,14 @@
96 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
97
98 #### Use 'system' SQLite
99 #
100 # USE_SYSTEM_SQLITE = 1
 
 
 
 
101
102 #### Use the SQLite Encryption Extension
103 #
104 # USE_SEE = 1
105
@@ -333,10 +337,16 @@
333 # With JSON support
334 ifdef FOSSIL_ENABLE_JSON
335 TCC += -DFOSSIL_ENABLE_JSON=1
336 RCC += -DFOSSIL_ENABLE_JSON=1
337 endif
 
 
 
 
 
 
338
339 # With SQLite Encryption Extension support
340 ifdef USE_SEE
341 TCC += -DUSE_SEE=1
342 RCC += -DUSE_SEE=1
343
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -96,10 +96,14 @@
96 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
97
98 #### Use 'system' SQLite
99 #
100 # USE_SYSTEM_SQLITE = 1
101
102 #### Use POSIX memory APIs from "sys/mman.h"
103 #
104 # USE_MMAN_H = 1
105
106 #### Use the SQLite Encryption Extension
107 #
108 # USE_SEE = 1
109
@@ -333,10 +337,16 @@
337 # With JSON support
338 ifdef FOSSIL_ENABLE_JSON
339 TCC += -DFOSSIL_ENABLE_JSON=1
340 RCC += -DFOSSIL_ENABLE_JSON=1
341 endif
342
343 # With "sys/mman.h" support
344 ifdef USE_MMAN_H
345 TCC += -DUSE_MMAN_H=1
346 RCC += -DUSE_MMAN_H=1
347 endif
348
349 # With SQLite Encryption Extension support
350 ifdef USE_SEE
351 TCC += -DUSE_SEE=1
352 RCC += -DUSE_SEE=1
353
--- win/fossil.rc
+++ win/fossil.rc
@@ -161,10 +161,15 @@
161161
#endif /* defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS) */
162162
#endif /* defined(FOSSIL_ENABLE_TCL) */
163163
#if defined(FOSSIL_ENABLE_JSON)
164164
VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
165165
#endif /* defined(FOSSIL_ENABLE_JSON) */
166
+#if defined(USE_MMAN_H)
167
+ VALUE "UseMmanEnabled", "Yes\0"
168
+#else
169
+ VALUE "UseMmanEnabled", "No\0"
170
+#endif /* defined(USE_MMAN_H) */
166171
#if defined(USE_SEE)
167172
VALUE "UseSeeEnabled", "Yes\0"
168173
#else
169174
VALUE "UseSeeEnabled", "No\0"
170175
#endif /* defined(USE_SEE) */
171176
--- win/fossil.rc
+++ win/fossil.rc
@@ -161,10 +161,15 @@
161 #endif /* defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS) */
162 #endif /* defined(FOSSIL_ENABLE_TCL) */
163 #if defined(FOSSIL_ENABLE_JSON)
164 VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
165 #endif /* defined(FOSSIL_ENABLE_JSON) */
 
 
 
 
 
166 #if defined(USE_SEE)
167 VALUE "UseSeeEnabled", "Yes\0"
168 #else
169 VALUE "UseSeeEnabled", "No\0"
170 #endif /* defined(USE_SEE) */
171
--- win/fossil.rc
+++ win/fossil.rc
@@ -161,10 +161,15 @@
161 #endif /* defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS) */
162 #endif /* defined(FOSSIL_ENABLE_TCL) */
163 #if defined(FOSSIL_ENABLE_JSON)
164 VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
165 #endif /* defined(FOSSIL_ENABLE_JSON) */
166 #if defined(USE_MMAN_H)
167 VALUE "UseMmanEnabled", "Yes\0"
168 #else
169 VALUE "UseMmanEnabled", "No\0"
170 #endif /* defined(USE_MMAN_H) */
171 #if defined(USE_SEE)
172 VALUE "UseSeeEnabled", "Yes\0"
173 #else
174 VALUE "UseSeeEnabled", "No\0"
175 #endif /* defined(USE_SEE) */
176
+1
--- www/th1.md
+++ www/th1.md
@@ -345,10 +345,11 @@
345345
1. **tclPrivateStubs** -- _Uses Tcl private stubs (i.e. header-only)._
346346
1. **json** -- _Support for the JSON APIs._
347347
1. **markdown** -- _Support for Markdown documentation format._
348348
1. **unicodeCmdLine** -- _The command line arguments are Unicode._
349349
1. **dynamicBuild** -- _Dynamically linked to libraries._
350
+ 1. **mman** -- _Uses POSIX memory APIs from "sys/mman.h"._
350351
1. **see** -- _Uses the SQLite Encryption Extension._
351352
352353
Specifying an unknown feature will return a value of false, it will not
353354
raise a script error.
354355
355356
--- www/th1.md
+++ www/th1.md
@@ -345,10 +345,11 @@
345 1. **tclPrivateStubs** -- _Uses Tcl private stubs (i.e. header-only)._
346 1. **json** -- _Support for the JSON APIs._
347 1. **markdown** -- _Support for Markdown documentation format._
348 1. **unicodeCmdLine** -- _The command line arguments are Unicode._
349 1. **dynamicBuild** -- _Dynamically linked to libraries._
 
350 1. **see** -- _Uses the SQLite Encryption Extension._
351
352 Specifying an unknown feature will return a value of false, it will not
353 raise a script error.
354
355
--- www/th1.md
+++ www/th1.md
@@ -345,10 +345,11 @@
345 1. **tclPrivateStubs** -- _Uses Tcl private stubs (i.e. header-only)._
346 1. **json** -- _Support for the JSON APIs._
347 1. **markdown** -- _Support for Markdown documentation format._
348 1. **unicodeCmdLine** -- _The command line arguments are Unicode._
349 1. **dynamicBuild** -- _Dynamically linked to libraries._
350 1. **mman** -- _Uses POSIX memory APIs from "sys/mman.h"._
351 1. **see** -- _Uses the SQLite Encryption Extension._
352
353 Specifying an unknown feature will return a value of false, it will not
354 raise a script error.
355
356

Keyboard Shortcuts

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