Fossil SCM

Merge updates from trunk.

mistachkin 2015-07-11 07:39 UTC enhancedUndo merge
Commit 0e4247f92f1d31479ab5b80bc1a6d7b1df54dc65
Parent a02d847edb8c2d1…
6 files changed +2 -2 +5 -3 +1 -1 +1 -1 +1 -1 +1 -1
~ src/makemake.tcl ~ src/th_tcl.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597597
 #### The directories where the OpenSSL include and library files are located.
598598
 # The recommended usage here is to use the Sysinternals junction tool
599599
 # to create a hard link between an "openssl-1.x" sub-directory of the
600600
 # Fossil source code directory and the target OpenSSL source directory.
601601
 #
602
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
602
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
603603
 OPENSSLINCDIR = $(OPENSSLDIR)/include
604604
 OPENSSLLIBDIR = $(OPENSSLDIR)
605605
606606
 #### Either the directory where the Tcl library is installed or the Tcl
607607
 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
13731373
 !ifndef FOSSIL_ENABLE_WINXP
13741374
 FOSSIL_ENABLE_WINXP = 0
13751375
 !endif
13761376
13771377
 !if $(FOSSIL_ENABLE_SSL)!=0
1378
-SSLDIR = $(B)\compat\openssl-1.0.2c
1378
+SSLDIR = $(B)\compat\openssl-1.0.2d
13791379
 SSLINCDIR = $(SSLDIR)\inc32
13801380
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
13811381
 SSLLIBDIR = $(SSLDIR)\out32dll
13821382
 !else
13831383
 SSLLIBDIR = $(SSLDIR)\out32
13841384
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597 #### The directories where the OpenSSL include and library files are located.
598 # The recommended usage here is to use the Sysinternals junction tool
599 # to create a hard link between an "openssl-1.x" sub-directory of the
600 # Fossil source code directory and the target OpenSSL source directory.
601 #
602 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
603 OPENSSLINCDIR = $(OPENSSLDIR)/include
604 OPENSSLLIBDIR = $(OPENSSLDIR)
605
606 #### Either the directory where the Tcl library is installed or the Tcl
607 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
1373 !ifndef FOSSIL_ENABLE_WINXP
1374 FOSSIL_ENABLE_WINXP = 0
1375 !endif
1376
1377 !if $(FOSSIL_ENABLE_SSL)!=0
1378 SSLDIR = $(B)\compat\openssl-1.0.2c
1379 SSLINCDIR = $(SSLDIR)\inc32
1380 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1381 SSLLIBDIR = $(SSLDIR)\out32dll
1382 !else
1383 SSLLIBDIR = $(SSLDIR)\out32
1384
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -597,11 +597,11 @@
597 #### The directories where the OpenSSL include and library files are located.
598 # The recommended usage here is to use the Sysinternals junction tool
599 # to create a hard link between an "openssl-1.x" sub-directory of the
600 # Fossil source code directory and the target OpenSSL source directory.
601 #
602 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
603 OPENSSLINCDIR = $(OPENSSLDIR)/include
604 OPENSSLLIBDIR = $(OPENSSLDIR)
605
606 #### Either the directory where the Tcl library is installed or the Tcl
607 # source code directory resides (depending on the value of the macro
@@ -1373,11 +1373,11 @@
1373 !ifndef FOSSIL_ENABLE_WINXP
1374 FOSSIL_ENABLE_WINXP = 0
1375 !endif
1376
1377 !if $(FOSSIL_ENABLE_SSL)!=0
1378 SSLDIR = $(B)\compat\openssl-1.0.2d
1379 SSLINCDIR = $(SSLDIR)\inc32
1380 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1381 SSLLIBDIR = $(SSLDIR)\out32dll
1382 !else
1383 SSLLIBDIR = $(SSLDIR)\out32
1384
M src/th_tcl.c
+5 -3
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -82,10 +82,11 @@
8282
 # if defined(_WIN32)
8383
 # if !defined(WIN32_LEAN_AND_MEAN)
8484
 # define WIN32_LEAN_AND_MEAN
8585
 # endif
8686
 # if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0502)
87
+# undef _WIN32_WINNT
8788
 # define _WIN32_WINNT 0x0502 /* SetDllDirectory, Windows XP SP2 */
8889
 # endif
8990
 # include <windows.h>
9091
 # ifndef TCL_DIRECTORY_SEP
9192
 # define TCL_DIRECTORY_SEP '\\'
@@ -342,11 +343,11 @@
342343
 */
343344
 static const char *getTclReturnCodeName(
344345
 int rc,
345346
 int nullIfOk
346347
 ){
347
- static char zRc[32];
348
+ static char zRc[TCL_INTEGER_SPACE + 17]; /* "Tcl return code\0" */
348349
349350
 switch( rc ){
350351
 case TCL_OK: return nullIfOk ? 0 : "TCL_OK";
351352
 case TCL_ERROR: return "TCL_ERROR";
352353
 case TCL_RETURN: return "TCL_RETURN";
@@ -395,11 +396,11 @@
395396
 tcl_DeleteInterpProc *xDeleteInterp; /* Tcl_DeleteInterp() pointer. */
396397
 tcl_FinalizeProc *xFinalize; /* Tcl_Finalize() pointer. */
397398
 Tcl_Interp *interp; /* The on-demand created Tcl interpreter. */
398399
 int useObjProc; /* Non-zero if an objProc can be called directly. */
399400
 int useTip285; /* Non-zero if TIP #285 is available. */
400
- char *setup; /* The optional Tcl setup script. */
401
+ const char *setup; /* The optional Tcl setup script. */
401402
 tcl_NotifyProc *xPreEval; /* Optional, called before Tcl_Eval*(). */
402403
 void *pPreContext; /* Optional, provided to xPreEval(). */
403404
 tcl_NotifyProc *xPostEval; /* Optional, called after Tcl_Eval*(). */
404405
 void *pPostContext; /* Optional, provided to xPostEval(). */
405406
 };
@@ -791,10 +792,11 @@
791792
 if( zDirName ){
792793
 fossil_free(zDirName); zDirName = 0;
793794
 }
794795
 #endif /* TCL_USE_SET_DLL_DIRECTORY */
795796
 }
797
+ if( !zFileName ) break;
796798
 hLibrary = dlopen(zFileName, RTLD_NOW | RTLD_GLOBAL);
797799
 /* NOTE: If the file name was allocated, free it now. */
798800
 if( zFileName!=aFileName ){
799801
 sqlite3_free(zFileName); zFileName = 0;
800802
 }
@@ -991,11 +993,11 @@
991993
 struct TclContext *tclContext = (struct TclContext *)pContext;
992994
 int argc;
993995
 char **argv;
994996
 char *argv0 = 0;
995997
 Tcl_Interp *tclInterp;
996
- char *setup;
998
+ const char *setup;
997999
9981000
 if( !tclContext ){
9991001
 Th_ErrorMessage(interp,
10001002
 "invalid Tcl context", (const char *)"", 0);
10011003
 return TH_ERROR;
10021004
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -82,10 +82,11 @@
82 # if defined(_WIN32)
83 # if !defined(WIN32_LEAN_AND_MEAN)
84 # define WIN32_LEAN_AND_MEAN
85 # endif
86 # if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0502)
 
87 # define _WIN32_WINNT 0x0502 /* SetDllDirectory, Windows XP SP2 */
88 # endif
89 # include <windows.h>
90 # ifndef TCL_DIRECTORY_SEP
91 # define TCL_DIRECTORY_SEP '\\'
@@ -342,11 +343,11 @@
342 */
343 static const char *getTclReturnCodeName(
344 int rc,
345 int nullIfOk
346 ){
347 static char zRc[32];
348
349 switch( rc ){
350 case TCL_OK: return nullIfOk ? 0 : "TCL_OK";
351 case TCL_ERROR: return "TCL_ERROR";
352 case TCL_RETURN: return "TCL_RETURN";
@@ -395,11 +396,11 @@
395 tcl_DeleteInterpProc *xDeleteInterp; /* Tcl_DeleteInterp() pointer. */
396 tcl_FinalizeProc *xFinalize; /* Tcl_Finalize() pointer. */
397 Tcl_Interp *interp; /* The on-demand created Tcl interpreter. */
398 int useObjProc; /* Non-zero if an objProc can be called directly. */
399 int useTip285; /* Non-zero if TIP #285 is available. */
400 char *setup; /* The optional Tcl setup script. */
401 tcl_NotifyProc *xPreEval; /* Optional, called before Tcl_Eval*(). */
402 void *pPreContext; /* Optional, provided to xPreEval(). */
403 tcl_NotifyProc *xPostEval; /* Optional, called after Tcl_Eval*(). */
404 void *pPostContext; /* Optional, provided to xPostEval(). */
405 };
@@ -791,10 +792,11 @@
791 if( zDirName ){
792 fossil_free(zDirName); zDirName = 0;
793 }
794 #endif /* TCL_USE_SET_DLL_DIRECTORY */
795 }
 
796 hLibrary = dlopen(zFileName, RTLD_NOW | RTLD_GLOBAL);
797 /* NOTE: If the file name was allocated, free it now. */
798 if( zFileName!=aFileName ){
799 sqlite3_free(zFileName); zFileName = 0;
800 }
@@ -991,11 +993,11 @@
991 struct TclContext *tclContext = (struct TclContext *)pContext;
992 int argc;
993 char **argv;
994 char *argv0 = 0;
995 Tcl_Interp *tclInterp;
996 char *setup;
997
998 if( !tclContext ){
999 Th_ErrorMessage(interp,
1000 "invalid Tcl context", (const char *)"", 0);
1001 return TH_ERROR;
1002
--- src/th_tcl.c
+++ src/th_tcl.c
@@ -82,10 +82,11 @@
82 # if defined(_WIN32)
83 # if !defined(WIN32_LEAN_AND_MEAN)
84 # define WIN32_LEAN_AND_MEAN
85 # endif
86 # if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0502)
87 # undef _WIN32_WINNT
88 # define _WIN32_WINNT 0x0502 /* SetDllDirectory, Windows XP SP2 */
89 # endif
90 # include <windows.h>
91 # ifndef TCL_DIRECTORY_SEP
92 # define TCL_DIRECTORY_SEP '\\'
@@ -342,11 +343,11 @@
343 */
344 static const char *getTclReturnCodeName(
345 int rc,
346 int nullIfOk
347 ){
348 static char zRc[TCL_INTEGER_SPACE + 17]; /* "Tcl return code\0" */
349
350 switch( rc ){
351 case TCL_OK: return nullIfOk ? 0 : "TCL_OK";
352 case TCL_ERROR: return "TCL_ERROR";
353 case TCL_RETURN: return "TCL_RETURN";
@@ -395,11 +396,11 @@
396 tcl_DeleteInterpProc *xDeleteInterp; /* Tcl_DeleteInterp() pointer. */
397 tcl_FinalizeProc *xFinalize; /* Tcl_Finalize() pointer. */
398 Tcl_Interp *interp; /* The on-demand created Tcl interpreter. */
399 int useObjProc; /* Non-zero if an objProc can be called directly. */
400 int useTip285; /* Non-zero if TIP #285 is available. */
401 const char *setup; /* The optional Tcl setup script. */
402 tcl_NotifyProc *xPreEval; /* Optional, called before Tcl_Eval*(). */
403 void *pPreContext; /* Optional, provided to xPreEval(). */
404 tcl_NotifyProc *xPostEval; /* Optional, called after Tcl_Eval*(). */
405 void *pPostContext; /* Optional, provided to xPostEval(). */
406 };
@@ -791,10 +792,11 @@
792 if( zDirName ){
793 fossil_free(zDirName); zDirName = 0;
794 }
795 #endif /* TCL_USE_SET_DLL_DIRECTORY */
796 }
797 if( !zFileName ) break;
798 hLibrary = dlopen(zFileName, RTLD_NOW | RTLD_GLOBAL);
799 /* NOTE: If the file name was allocated, free it now. */
800 if( zFileName!=aFileName ){
801 sqlite3_free(zFileName); zFileName = 0;
802 }
@@ -991,11 +993,11 @@
993 struct TclContext *tclContext = (struct TclContext *)pContext;
994 int argc;
995 char **argv;
996 char *argv0 = 0;
997 Tcl_Interp *tclInterp;
998 const char *setup;
999
1000 if( !tclContext ){
1001 Th_ErrorMessage(interp,
1002 "invalid Tcl context", (const char *)"", 0);
1003 return TH_ERROR;
1004
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150150
 #### The directories where the OpenSSL include and library files are located.
151151
 # The recommended usage here is to use the Sysinternals junction tool
152152
 # to create a hard link between an "openssl-1.x" sub-directory of the
153153
 # Fossil source code directory and the target OpenSSL source directory.
154154
 #
155
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
155
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156156
 OPENSSLINCDIR = $(OPENSSLDIR)/include
157157
 OPENSSLLIBDIR = $(OPENSSLDIR)
158158
159159
 #### Either the directory where the Tcl library is installed or the Tcl
160160
 # source code directory resides (depending on the value of the macro
161161
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150150
 #### The directories where the OpenSSL include and library files are located.
151151
 # The recommended usage here is to use the Sysinternals junction tool
152152
 # to create a hard link between an "openssl-1.x" sub-directory of the
153153
 # Fossil source code directory and the target OpenSSL source directory.
154154
 #
155
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
155
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156156
 OPENSSLINCDIR = $(OPENSSLDIR)/include
157157
 OPENSSLLIBDIR = $(OPENSSLDIR)
158158
159159
 #### Either the directory where the Tcl library is installed or the Tcl
160160
 # source code directory resides (depending on the value of the macro
161161
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -150,11 +150,11 @@
150 #### The directories where the OpenSSL include and library files are located.
151 # The recommended usage here is to use the Sysinternals junction tool
152 # to create a hard link between an "openssl-1.x" sub-directory of the
153 # Fossil source code directory and the target OpenSSL source directory.
154 #
155 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d
156 OPENSSLINCDIR = $(OPENSSLDIR)/include
157 OPENSSLLIBDIR = $(OPENSSLDIR)
158
159 #### Either the directory where the Tcl library is installed or the Tcl
160 # source code directory resides (depending on the value of the macro
161
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
8888
 !ifndef FOSSIL_ENABLE_WINXP
8989
 FOSSIL_ENABLE_WINXP = 0
9090
 !endif
9191
9292
 !if $(FOSSIL_ENABLE_SSL)!=0
93
-SSLDIR = $(B)\compat\openssl-1.0.2c
93
+SSLDIR = $(B)\compat\openssl-1.0.2d
9494
 SSLINCDIR = $(SSLDIR)\inc32
9595
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
9696
 SSLLIBDIR = $(SSLDIR)\out32dll
9797
 !else
9898
 SSLLIBDIR = $(SSLDIR)\out32
9999
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
88 !ifndef FOSSIL_ENABLE_WINXP
89 FOSSIL_ENABLE_WINXP = 0
90 !endif
91
92 !if $(FOSSIL_ENABLE_SSL)!=0
93 SSLDIR = $(B)\compat\openssl-1.0.2c
94 SSLINCDIR = $(SSLDIR)\inc32
95 !if $(FOSSIL_DYNAMIC_BUILD)!=0
96 SSLLIBDIR = $(SSLDIR)\out32dll
97 !else
98 SSLLIBDIR = $(SSLDIR)\out32
99
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -88,11 +88,11 @@
88 !ifndef FOSSIL_ENABLE_WINXP
89 FOSSIL_ENABLE_WINXP = 0
90 !endif
91
92 !if $(FOSSIL_ENABLE_SSL)!=0
93 SSLDIR = $(B)\compat\openssl-1.0.2d
94 SSLINCDIR = $(SSLDIR)\inc32
95 !if $(FOSSIL_DYNAMIC_BUILD)!=0
96 SSLLIBDIR = $(SSLDIR)\out32dll
97 !else
98 SSLLIBDIR = $(SSLDIR)\out32
99
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135135
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136136
 first <a href="https://www.openssl.org/source/">download the official
137137
 source code for OpenSSL</a> and extract it to an appropriately named
138138
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139139
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140
-"<b>compat/openssl-1.0.2c</b>"), then make sure that some recent
140
+"<b>compat/openssl-1.0.2d</b>"), then make sure that some recent
141141
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142142
 and finally run one of the following commands:
143143
 <blockquote><pre>
144144
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145145
 </pre></blockquote>
146146
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136 first <a href="https://www.openssl.org/source/">download the official
137 source code for OpenSSL</a> and extract it to an appropriately named
138 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140 "<b>compat/openssl-1.0.2c</b>"), then make sure that some recent
141 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142 and finally run one of the following commands:
143 <blockquote><pre>
144 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145 </pre></blockquote>
146
--- www/build.wiki
+++ www/build.wiki
@@ -135,11 +135,11 @@
135 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
136 first <a href="https://www.openssl.org/source/">download the official
137 source code for OpenSSL</a> and extract it to an appropriately named
138 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
139 [/tree?ci=trunk&name=compat | compat] directory (e.g.
140 "<b>compat/openssl-1.0.2d</b>"), then make sure that some recent
141 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
142 and finally run one of the following commands:
143 <blockquote><pre>
144 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
145 </pre></blockquote>
146

Keyboard Shortcuts

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