Fossil SCM

Further cleanup and naming consistency.

mistachkin 2013-09-16 06:17 UTC tcl-stubs
Commit 48f501ec2181b5dd91b4a42659c9a368cc85853f
Parent a76a134bfd4e295…
6 files changed +1 -1 +18 -17 +7 -7 +3 -3 +7 -7 +6 -6
~ Makefile.in ~ auto.def ~ src/makemake.tcl ~ src/th_tcl.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M Makefile.in
+1 -1
--- Makefile.in
+++ Makefile.in
@@ -42,11 +42,11 @@
4242
 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
4343
 INSTALLDIR = $(DESTDIR)@prefix@/bin
4444
 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
4545
 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
4646
 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
47
-FOSSIL_ENABLE_TCL_FAKE_STUBS = @FOSSIL_ENABLE_TCL_FAKE_STUBS@
47
+FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
4848
4949
 include $(SRCDIR)/main.mk
5050
5151
 distclean: clean
5252
 rm -f autoconfig.h config.log Makefile
5353
--- Makefile.in
+++ Makefile.in
@@ -42,11 +42,11 @@
42 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
43 INSTALLDIR = $(DESTDIR)@prefix@/bin
44 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
46 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
47 FOSSIL_ENABLE_TCL_FAKE_STUBS = @FOSSIL_ENABLE_TCL_FAKE_STUBS@
48
49 include $(SRCDIR)/main.mk
50
51 distclean: clean
52 rm -f autoconfig.h config.log Makefile
53
--- Makefile.in
+++ Makefile.in
@@ -42,11 +42,11 @@
42 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
43 INSTALLDIR = $(DESTDIR)@prefix@/bin
44 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45 FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
46 FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@
47 FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@
48
49 include $(SRCDIR)/main.mk
50
51 distclean: clean
52 rm -f autoconfig.h config.log Makefile
53
M auto.def
+18 -17
--- auto.def
+++ auto.def
@@ -2,20 +2,21 @@
22
33
 use cc cc-lib
44
55
 options {
66
 with-openssl:path|auto|none
7
- => {Look for openssl in the given path, or auto or none}
8
- with-zlib:path => {Look for zlib in the given path}
9
- with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
10
- with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
11
- with-tcl-fake-stubs=0 => {Enable Tcl integration via private stubs mechanism}
12
- internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
13
- static=0 => {Link a static executable}
14
- lineedit=1 => {Disable line editing}
15
- fossil-debug=0 => {Build with fossil debugging enabled}
16
- json=0 => {Build with fossil JSON API enabled}
7
+ => {Look for openssl in the given path, or auto or none}
8
+ with-zlib:path => {Look for zlib in the given path}
9
+ with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
10
+ with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
11
+ with-tcl-private-stubs=0
12
+ => {Enable Tcl integration via private stubs mechanism}
13
+ internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
14
+ static=0 => {Link a static executable}
15
+ lineedit=1 => {Disable line editing}
16
+ fossil-debug=0 => {Build with fossil debugging enabled}
17
+ json=0 => {Build with fossil JSON API enabled}
1718
 }
1819
1920
 # sqlite wants these types if possible
2021
 cc-with {-includes {stdint.h inttypes.h}} {
2122
 cc-check-types uint32_t uint16_t int16_t uint8_t
@@ -115,23 +116,23 @@
115116
 }
116117
 if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
117118
 user-error "Cannot find Tcl $msg"
118119
 }
119120
 set tclstubs [opt-bool with-tcl-stubs]
120
- set tclfakestubs [opt-bool with-tcl-fake-stubs]
121
- if {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} {
121
+ set tclprivatestubs [opt-bool with-tcl-private-stubs]
122
+ if {$tclprivatestubs} {
123
+ define FOSSIL_ENABLE_TCL_PRIVATE_STUBS
124
+ define USE_TCL_STUBS
125
+ } elseif {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} {
122126
 set libs "$tclconfig(TCL_STUB_LIB_SPEC)"
123127
 define FOSSIL_ENABLE_TCL_STUBS
124128
 define USE_TCL_STUBS
125
- } elseif {$tclfakestubs} {
126
- define FOSSIL_ENABLE_TCL_FAKE_STUBS
127
- define USE_TCL_STUBS
128129
 } else {
129130
 set libs "$tclconfig(TCL_LIB_SPEC) $tclconfig(TCL_LIBS)"
130131
 }
131132
 set cflags $tclconfig(TCL_INCLUDE_SPEC)
132
- if {!$tclfakestubs} {
133
+ if {!$tclprivatestubs} {
133134
 cc-with [list -cflags $cflags -libs $libs] {
134135
 if {$tclstubs} {
135136
 if {![cc-check-functions Tcl_InitStubs]} {
136137
 user-error "Cannot find a usable Tcl stubs library $msg"
137138
 }
@@ -142,11 +143,11 @@
142143
 }
143144
 }
144145
 }
145146
 set version $tclconfig(TCL_VERSION)$tclconfig(TCL_PATCH_LEVEL)
146147
 msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)"
147
- if {!$tclfakestubs} {
148
+ if {!$tclprivatestubs} {
148149
 define-append LIBS $libs
149150
 }
150151
 define-append EXTRA_CFLAGS $cflags
151152
 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
152153
 define FOSSIL_ENABLE_TCL
153154
--- auto.def
+++ auto.def
@@ -2,20 +2,21 @@
2
3 use cc cc-lib
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for openssl in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
10 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
11 with-tcl-fake-stubs=0 => {Enable Tcl integration via private stubs mechanism}
12 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
13 static=0 => {Link a static executable}
14 lineedit=1 => {Disable line editing}
15 fossil-debug=0 => {Build with fossil debugging enabled}
16 json=0 => {Build with fossil JSON API enabled}
 
17 }
18
19 # sqlite wants these types if possible
20 cc-with {-includes {stdint.h inttypes.h}} {
21 cc-check-types uint32_t uint16_t int16_t uint8_t
@@ -115,23 +116,23 @@
115 }
116 if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
117 user-error "Cannot find Tcl $msg"
118 }
119 set tclstubs [opt-bool with-tcl-stubs]
120 set tclfakestubs [opt-bool with-tcl-fake-stubs]
121 if {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} {
 
 
 
122 set libs "$tclconfig(TCL_STUB_LIB_SPEC)"
123 define FOSSIL_ENABLE_TCL_STUBS
124 define USE_TCL_STUBS
125 } elseif {$tclfakestubs} {
126 define FOSSIL_ENABLE_TCL_FAKE_STUBS
127 define USE_TCL_STUBS
128 } else {
129 set libs "$tclconfig(TCL_LIB_SPEC) $tclconfig(TCL_LIBS)"
130 }
131 set cflags $tclconfig(TCL_INCLUDE_SPEC)
132 if {!$tclfakestubs} {
133 cc-with [list -cflags $cflags -libs $libs] {
134 if {$tclstubs} {
135 if {![cc-check-functions Tcl_InitStubs]} {
136 user-error "Cannot find a usable Tcl stubs library $msg"
137 }
@@ -142,11 +143,11 @@
142 }
143 }
144 }
145 set version $tclconfig(TCL_VERSION)$tclconfig(TCL_PATCH_LEVEL)
146 msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)"
147 if {!$tclfakestubs} {
148 define-append LIBS $libs
149 }
150 define-append EXTRA_CFLAGS $cflags
151 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
152 define FOSSIL_ENABLE_TCL
153
--- auto.def
+++ auto.def
@@ -2,20 +2,21 @@
2
3 use cc cc-lib
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for openssl in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
10 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
11 with-tcl-private-stubs=0
12 => {Enable Tcl integration via private stubs mechanism}
13 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
14 static=0 => {Link a static executable}
15 lineedit=1 => {Disable line editing}
16 fossil-debug=0 => {Build with fossil debugging enabled}
17 json=0 => {Build with fossil JSON API enabled}
18 }
19
20 # sqlite wants these types if possible
21 cc-with {-includes {stdint.h inttypes.h}} {
22 cc-check-types uint32_t uint16_t int16_t uint8_t
@@ -115,23 +116,23 @@
116 }
117 if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
118 user-error "Cannot find Tcl $msg"
119 }
120 set tclstubs [opt-bool with-tcl-stubs]
121 set tclprivatestubs [opt-bool with-tcl-private-stubs]
122 if {$tclprivatestubs} {
123 define FOSSIL_ENABLE_TCL_PRIVATE_STUBS
124 define USE_TCL_STUBS
125 } elseif {$tclstubs && $tclconfig(TCL_SUPPORTS_STUBS)} {
126 set libs "$tclconfig(TCL_STUB_LIB_SPEC)"
127 define FOSSIL_ENABLE_TCL_STUBS
128 define USE_TCL_STUBS
 
 
 
129 } else {
130 set libs "$tclconfig(TCL_LIB_SPEC) $tclconfig(TCL_LIBS)"
131 }
132 set cflags $tclconfig(TCL_INCLUDE_SPEC)
133 if {!$tclprivatestubs} {
134 cc-with [list -cflags $cflags -libs $libs] {
135 if {$tclstubs} {
136 if {![cc-check-functions Tcl_InitStubs]} {
137 user-error "Cannot find a usable Tcl stubs library $msg"
138 }
@@ -142,11 +143,11 @@
143 }
144 }
145 }
146 set version $tclconfig(TCL_VERSION)$tclconfig(TCL_PATCH_LEVEL)
147 msg-result "Found Tcl $version at $tclconfig(TCL_PREFIX)"
148 if {!$tclprivatestubs} {
149 define-append LIBS $libs
150 }
151 define-append EXTRA_CFLAGS $cflags
152 define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
153 define FOSSIL_ENABLE_TCL
154
M src/makemake.tcl
+7 -7
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,17 +391,17 @@
391391
392392
 #### Enable scripting support via Tcl/Tk
393393
 #
394394
 # FOSSIL_ENABLE_TCL = 1
395395
396
-#### Load Tcl using the stubs mechanism
396
+#### Load Tcl using the stubs library mechanism
397397
 #
398398
 # FOSSIL_ENABLE_TCL_STUBS = 1
399399
400
-#### Load Tcl using the "fake" stubs mechanism
400
+#### Load Tcl using the private stubs mechanism
401401
 #
402
-# FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
402
+# FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
403403
404404
 #### Use the Tcl source directory instead of the install directory?
405405
 # This is useful when Tcl has been compiled statically with MinGW.
406406
 #
407407
 FOSSIL_TCL_SOURCE = 1
@@ -454,11 +454,11 @@
454454
 TCLLIBDIR = $(TCLDIR)/lib
455455
456456
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
457457
 #
458458
 ifdef FOSSIL_ENABLE_TCL_STUBS
459
-ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
459
+ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
460460
 LIBTCL = -ltclstub86
461461
 endif
462462
 else
463463
 LIBTCL = -ltcl86
464464
 endif
@@ -518,13 +518,13 @@
518518
 RCC += -DFOSSIL_ENABLE_TCL=1
519519
 # Either statically linked or via stubs
520520
 ifdef FOSSIL_ENABLE_TCL_STUBS
521521
 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
522522
 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
523
-ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
524
-TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
525
-RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
523
+ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
524
+TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
525
+RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
526526
 endif
527527
 else
528528
 TCC += -DSTATIC_BUILD
529529
 RCC += -DSTATIC_BUILD
530530
 endif
531531
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,17 +391,17 @@
391
392 #### Enable scripting support via Tcl/Tk
393 #
394 # FOSSIL_ENABLE_TCL = 1
395
396 #### Load Tcl using the stubs mechanism
397 #
398 # FOSSIL_ENABLE_TCL_STUBS = 1
399
400 #### Load Tcl using the "fake" stubs mechanism
401 #
402 # FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
403
404 #### Use the Tcl source directory instead of the install directory?
405 # This is useful when Tcl has been compiled statically with MinGW.
406 #
407 FOSSIL_TCL_SOURCE = 1
@@ -454,11 +454,11 @@
454 TCLLIBDIR = $(TCLDIR)/lib
455
456 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
457 #
458 ifdef FOSSIL_ENABLE_TCL_STUBS
459 ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
460 LIBTCL = -ltclstub86
461 endif
462 else
463 LIBTCL = -ltcl86
464 endif
@@ -518,13 +518,13 @@
518 RCC += -DFOSSIL_ENABLE_TCL=1
519 # Either statically linked or via stubs
520 ifdef FOSSIL_ENABLE_TCL_STUBS
521 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
522 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
523 ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
524 TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
525 RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
526 endif
527 else
528 TCC += -DSTATIC_BUILD
529 RCC += -DSTATIC_BUILD
530 endif
531
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,17 +391,17 @@
391
392 #### Enable scripting support via Tcl/Tk
393 #
394 # FOSSIL_ENABLE_TCL = 1
395
396 #### Load Tcl using the stubs library mechanism
397 #
398 # FOSSIL_ENABLE_TCL_STUBS = 1
399
400 #### Load Tcl using the private stubs mechanism
401 #
402 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
403
404 #### Use the Tcl source directory instead of the install directory?
405 # This is useful when Tcl has been compiled statically with MinGW.
406 #
407 FOSSIL_TCL_SOURCE = 1
@@ -454,11 +454,11 @@
454 TCLLIBDIR = $(TCLDIR)/lib
455
456 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
457 #
458 ifdef FOSSIL_ENABLE_TCL_STUBS
459 ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
460 LIBTCL = -ltclstub86
461 endif
462 else
463 LIBTCL = -ltcl86
464 endif
@@ -518,13 +518,13 @@
518 RCC += -DFOSSIL_ENABLE_TCL=1
519 # Either statically linked or via stubs
520 ifdef FOSSIL_ENABLE_TCL_STUBS
521 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
522 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
523 ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
524 TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
525 RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
526 endif
527 else
528 TCC += -DSTATIC_BUILD
529 RCC += -DSTATIC_BUILD
530 endif
531
M src/th_tcl.c
+3 -3
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -160,11 +160,11 @@
160160
 /*
161161
 ** Are we using our own private implementation of the Tcl stubs mechanism? If
162162
 ** this is enabled, it prevents the user from having to link against the Tcl
163163
 ** stubs library for the target platform, which may not be readily available.
164164
 */
165
-#if defined(FOSSIL_ENABLE_TCL_FAKE_STUBS)
165
+#if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
166166
 /*
167167
 ** HACK: Using some preprocessor magic and a private static variable, redirect
168168
 ** the Tcl API calls [found within this file] to the function pointers
169169
 ** that will be contained in our private Tcl stubs table. This takes
170170
 ** advantage of the fact that the Tcl headers always define the Tcl API
@@ -755,11 +755,11 @@
755755
 Th_ErrorMessage(interp,
756756
 "could not create Tcl interpreter", (const char *)"", 0);
757757
 return TH_ERROR;
758758
 }
759759
 #if defined(USE_TCL_STUBS)
760
-#if defined(FOSSIL_ENABLE_TCL_FAKE_STUBS)
760
+#if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
761761
 if( initTclStubs(interp, tclInterp)!=TH_OK ){
762762
 tclContext->xDeleteInterp(tclInterp);
763763
 return TH_ERROR;
764764
 }
765765
 #else
@@ -767,11 +767,11 @@
767767
 Th_ErrorMessage(interp,
768768
 "could not initialize Tcl stubs", (const char *)"", 0);
769769
 tclContext->xDeleteInterp(tclInterp);
770770
 return TH_ERROR;
771771
 }
772
-#endif /* defined(FOSSIL_ENABLE_TCL_FAKE_STUBS) */
772
+#endif /* defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS) */
773773
 #endif /* defined(USE_TCL_STUBS) */
774774
 if( Tcl_InterpDeleted(tclInterp) ){
775775
 Th_ErrorMessage(interp,
776776
 "Tcl interpreter appears to be deleted", (const char *)"", 0);
777777
 tclContext->xDeleteInterp(tclInterp); /* TODO: Redundant? */
778778
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -160,11 +160,11 @@
160 /*
161 ** Are we using our own private implementation of the Tcl stubs mechanism? If
162 ** this is enabled, it prevents the user from having to link against the Tcl
163 ** stubs library for the target platform, which may not be readily available.
164 */
165 #if defined(FOSSIL_ENABLE_TCL_FAKE_STUBS)
166 /*
167 ** HACK: Using some preprocessor magic and a private static variable, redirect
168 ** the Tcl API calls [found within this file] to the function pointers
169 ** that will be contained in our private Tcl stubs table. This takes
170 ** advantage of the fact that the Tcl headers always define the Tcl API
@@ -755,11 +755,11 @@
755 Th_ErrorMessage(interp,
756 "could not create Tcl interpreter", (const char *)"", 0);
757 return TH_ERROR;
758 }
759 #if defined(USE_TCL_STUBS)
760 #if defined(FOSSIL_ENABLE_TCL_FAKE_STUBS)
761 if( initTclStubs(interp, tclInterp)!=TH_OK ){
762 tclContext->xDeleteInterp(tclInterp);
763 return TH_ERROR;
764 }
765 #else
@@ -767,11 +767,11 @@
767 Th_ErrorMessage(interp,
768 "could not initialize Tcl stubs", (const char *)"", 0);
769 tclContext->xDeleteInterp(tclInterp);
770 return TH_ERROR;
771 }
772 #endif /* defined(FOSSIL_ENABLE_TCL_FAKE_STUBS) */
773 #endif /* defined(USE_TCL_STUBS) */
774 if( Tcl_InterpDeleted(tclInterp) ){
775 Th_ErrorMessage(interp,
776 "Tcl interpreter appears to be deleted", (const char *)"", 0);
777 tclContext->xDeleteInterp(tclInterp); /* TODO: Redundant? */
778
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -160,11 +160,11 @@
160 /*
161 ** Are we using our own private implementation of the Tcl stubs mechanism? If
162 ** this is enabled, it prevents the user from having to link against the Tcl
163 ** stubs library for the target platform, which may not be readily available.
164 */
165 #if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
166 /*
167 ** HACK: Using some preprocessor magic and a private static variable, redirect
168 ** the Tcl API calls [found within this file] to the function pointers
169 ** that will be contained in our private Tcl stubs table. This takes
170 ** advantage of the fact that the Tcl headers always define the Tcl API
@@ -755,11 +755,11 @@
755 Th_ErrorMessage(interp,
756 "could not create Tcl interpreter", (const char *)"", 0);
757 return TH_ERROR;
758 }
759 #if defined(USE_TCL_STUBS)
760 #if defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS)
761 if( initTclStubs(interp, tclInterp)!=TH_OK ){
762 tclContext->xDeleteInterp(tclInterp);
763 return TH_ERROR;
764 }
765 #else
@@ -767,11 +767,11 @@
767 Th_ErrorMessage(interp,
768 "could not initialize Tcl stubs", (const char *)"", 0);
769 tclContext->xDeleteInterp(tclInterp);
770 return TH_ERROR;
771 }
772 #endif /* defined(FOSSIL_ENABLE_TCL_PRIVATE_STUBS) */
773 #endif /* defined(USE_TCL_STUBS) */
774 if( Tcl_InterpDeleted(tclInterp) ){
775 Th_ErrorMessage(interp,
776 "Tcl interpreter appears to be deleted", (const char *)"", 0);
777 tclContext->xDeleteInterp(tclInterp); /* TODO: Redundant? */
778
M win/Makefile.mingw
+7 -7
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,17 +52,17 @@
5252
5353
 #### Enable scripting support via Tcl/Tk
5454
 #
5555
 # FOSSIL_ENABLE_TCL = 1
5656
57
-#### Load Tcl using the stubs mechanism
57
+#### Load Tcl using the stubs library mechanism
5858
 #
5959
 # FOSSIL_ENABLE_TCL_STUBS = 1
6060
61
-#### Load Tcl using the "fake" stubs mechanism
61
+#### Load Tcl using the private stubs mechanism
6262
 #
63
-# FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
63
+# FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
6464
6565
 #### Use the Tcl source directory instead of the install directory?
6666
 # This is useful when Tcl has been compiled statically with MinGW.
6767
 #
6868
 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115115
 TCLLIBDIR = $(TCLDIR)/lib
116116
117117
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118118
 #
119119
 ifdef FOSSIL_ENABLE_TCL_STUBS
120
-ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
120
+ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
121121
 LIBTCL = -ltclstub86
122122
 endif
123123
 else
124124
 LIBTCL = -ltcl86
125125
 endif
@@ -179,13 +179,13 @@
179179
 RCC += -DFOSSIL_ENABLE_TCL=1
180180
 # Either statically linked or via stubs
181181
 ifdef FOSSIL_ENABLE_TCL_STUBS
182182
 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183183
 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184
-ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
185
-TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
186
-RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
184
+ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
185
+TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
186
+RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
187187
 endif
188188
 else
189189
 TCC += -DSTATIC_BUILD
190190
 RCC += -DSTATIC_BUILD
191191
 endif
192192
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,17 +52,17 @@
52
53 #### Enable scripting support via Tcl/Tk
54 #
55 # FOSSIL_ENABLE_TCL = 1
56
57 #### Load Tcl using the stubs mechanism
58 #
59 # FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the "fake" stubs mechanism
62 #
63 # FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115 TCLLIBDIR = $(TCLDIR)/lib
116
117 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118 #
119 ifdef FOSSIL_ENABLE_TCL_STUBS
120 ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
121 LIBTCL = -ltclstub86
122 endif
123 else
124 LIBTCL = -ltcl86
125 endif
@@ -179,13 +179,13 @@
179 RCC += -DFOSSIL_ENABLE_TCL=1
180 # Either statically linked or via stubs
181 ifdef FOSSIL_ENABLE_TCL_STUBS
182 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184 ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
185 TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
186 RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
187 endif
188 else
189 TCC += -DSTATIC_BUILD
190 RCC += -DSTATIC_BUILD
191 endif
192
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -52,17 +52,17 @@
52
53 #### Enable scripting support via Tcl/Tk
54 #
55 # FOSSIL_ENABLE_TCL = 1
56
57 #### Load Tcl using the stubs library mechanism
58 #
59 # FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115 TCLLIBDIR = $(TCLDIR)/lib
116
117 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118 #
119 ifdef FOSSIL_ENABLE_TCL_STUBS
120 ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
121 LIBTCL = -ltclstub86
122 endif
123 else
124 LIBTCL = -ltcl86
125 endif
@@ -179,13 +179,13 @@
179 RCC += -DFOSSIL_ENABLE_TCL=1
180 # Either statically linked or via stubs
181 ifdef FOSSIL_ENABLE_TCL_STUBS
182 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184 ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
185 TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
186 RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
187 endif
188 else
189 TCC += -DSTATIC_BUILD
190 RCC += -DSTATIC_BUILD
191 endif
192
M win/Makefile.mingw.mistachkin
+6 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -56,13 +56,13 @@
5656
5757
 #### Load Tcl using the stubs mechanism
5858
 #
5959
 FOSSIL_ENABLE_TCL_STUBS = 1
6060
61
-#### Load Tcl using the "fake" stubs mechanism
61
+#### Load Tcl using the private stubs mechanism
6262
 #
63
-FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
63
+# FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
6464
6565
 #### Use the Tcl source directory instead of the install directory?
6666
 # This is useful when Tcl has been compiled statically with MinGW.
6767
 #
6868
 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115115
 TCLLIBDIR = $(TCLDIR)/lib
116116
117117
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118118
 #
119119
 ifdef FOSSIL_ENABLE_TCL_STUBS
120
-ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
120
+ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
121121
 LIBTCL = -ltclstub86
122122
 endif
123123
 else
124124
 LIBTCL = -ltcl86
125125
 endif
@@ -179,13 +179,13 @@
179179
 RCC += -DFOSSIL_ENABLE_TCL=1
180180
 # Either statically linked or via stubs
181181
 ifdef FOSSIL_ENABLE_TCL_STUBS
182182
 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183183
 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184
-ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
185
-TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
186
-RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
184
+ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
185
+TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
186
+RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
187187
 endif
188188
 else
189189
 TCC += -DSTATIC_BUILD
190190
 RCC += -DSTATIC_BUILD
191191
 endif
192192
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -56,13 +56,13 @@
56
57 #### Load Tcl using the stubs mechanism
58 #
59 FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the "fake" stubs mechanism
62 #
63 FOSSIL_ENABLE_TCL_FAKE_STUBS = 1
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115 TCLLIBDIR = $(TCLDIR)/lib
116
117 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118 #
119 ifdef FOSSIL_ENABLE_TCL_STUBS
120 ifndef FOSSIL_ENABLE_TCL_FAKE_STUBS
121 LIBTCL = -ltclstub86
122 endif
123 else
124 LIBTCL = -ltcl86
125 endif
@@ -179,13 +179,13 @@
179 RCC += -DFOSSIL_ENABLE_TCL=1
180 # Either statically linked or via stubs
181 ifdef FOSSIL_ENABLE_TCL_STUBS
182 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184 ifdef FOSSIL_ENABLE_TCL_FAKE_STUBS
185 TCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
186 RCC += -DFOSSIL_ENABLE_TCL_FAKE_STUBS=1
187 endif
188 else
189 TCC += -DSTATIC_BUILD
190 RCC += -DSTATIC_BUILD
191 endif
192
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -56,13 +56,13 @@
56
57 #### Load Tcl using the stubs mechanism
58 #
59 FOSSIL_ENABLE_TCL_STUBS = 1
60
61 #### Load Tcl using the private stubs mechanism
62 #
63 # FOSSIL_ENABLE_TCL_PRIVATE_STUBS = 1
64
65 #### Use the Tcl source directory instead of the install directory?
66 # This is useful when Tcl has been compiled statically with MinGW.
67 #
68 FOSSIL_TCL_SOURCE = 1
@@ -115,11 +115,11 @@
115 TCLLIBDIR = $(TCLDIR)/lib
116
117 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
118 #
119 ifdef FOSSIL_ENABLE_TCL_STUBS
120 ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
121 LIBTCL = -ltclstub86
122 endif
123 else
124 LIBTCL = -ltcl86
125 endif
@@ -179,13 +179,13 @@
179 RCC += -DFOSSIL_ENABLE_TCL=1
180 # Either statically linked or via stubs
181 ifdef FOSSIL_ENABLE_TCL_STUBS
182 TCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
183 RCC += -DFOSSIL_ENABLE_TCL_STUBS=1 -DUSE_TCL_STUBS
184 ifdef FOSSIL_ENABLE_TCL_PRIVATE_STUBS
185 TCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
186 RCC += -DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
187 endif
188 else
189 TCC += -DSTATIC_BUILD
190 RCC += -DSTATIC_BUILD
191 endif
192

Keyboard Shortcuts

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