Fossil SCM

merge trunk. Update references to OpenSSL 1.1.0a

jan.nijtmans 2016-09-23 07:33 openssl-1.1 merge
Commit 85f8133ce72d295ed61ba2b5a6f20b790f5fcf8b
Parent ff2c20e7fa6640e…
12 files changed +1 -1 +2 -2 +2 -2 +2 -2 +1 -1 +1 -1 +1 -1 +1 -1 +27 -5 +27 -5 +1 -1 +1 -1
~ src/dispatch.c ~ src/makemake.tcl ~ src/makemake.tcl ~ src/th_main.c ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc ~ www/build.wiki ~ www/build.wiki
M src/dispatch.c
+1 -1
--- src/dispatch.c
+++ src/dispatch.c
@@ -32,11 +32,11 @@
3232
 */
3333
 struct CmdOrPage {
3434
 const char *zName; /* Name. Webpages start with "/". Commands do not */
3535
 void (*xFunc)(void); /* Function that implements the command or webpage */
3636
 const char *zHelp; /* Raw help text */
37
- unsigned eCmdFlags; /* Flags */
37
+ unsigned int eCmdFlags; /* Flags */
3838
 };
3939
4040
 /***************************************************************************
4141
 ** These macros must match similar macros in mkindex.c
4242
 ** Allowed values for CmdOrPage.eCmdFlags.
4343
--- src/dispatch.c
+++ src/dispatch.c
@@ -32,11 +32,11 @@
32 */
33 struct CmdOrPage {
34 const char *zName; /* Name. Webpages start with "/". Commands do not */
35 void (*xFunc)(void); /* Function that implements the command or webpage */
36 const char *zHelp; /* Raw help text */
37 unsigned eCmdFlags; /* Flags */
38 };
39
40 /***************************************************************************
41 ** These macros must match similar macros in mkindex.c
42 ** Allowed values for CmdOrPage.eCmdFlags.
43
--- src/dispatch.c
+++ src/dispatch.c
@@ -32,11 +32,11 @@
32 */
33 struct CmdOrPage {
34 const char *zName; /* Name. Webpages start with "/". Commands do not */
35 void (*xFunc)(void); /* Function that implements the command or webpage */
36 const char *zHelp; /* Raw help text */
37 unsigned int eCmdFlags; /* Flags */
38 };
39
40 /***************************************************************************
41 ** These macros must match similar macros in mkindex.c
42 ** Allowed values for CmdOrPage.eCmdFlags.
43
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667667
 #### The directories where the OpenSSL include and library files are located.
668668
 # The recommended usage here is to use the Sysinternals junction tool
669669
 # to create a hard link between an "openssl-1.x" sub-directory of the
670670
 # Fossil source code directory and the target OpenSSL source directory.
671671
 #
672
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
672
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
673673
 OPENSSLINCDIR = $(OPENSSLDIR)/include
674674
 OPENSSLLIBDIR = $(OPENSSLDIR)
675675
676676
 #### Either the directory where the Tcl library is installed or the Tcl
677677
 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
14971497
 !ifndef USE_SEE
14981498
 USE_SEE = 0
14991499
 !endif
15001500
15011501
 !if $(FOSSIL_ENABLE_SSL)!=0
1502
-SSLDIR = $(B)\compat\openssl-1.1.0
1502
+SSLDIR = $(B)\compat\openssl-1.1.0a
15031503
 SSLINCDIR = $(SSLDIR)\inc32
15041504
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15051505
 SSLLIBDIR = $(SSLDIR)\out32dll
15061506
 !else
15071507
 SSLLIBDIR = $(SSLDIR)\out32
15081508
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667 #### The directories where the OpenSSL include and library files are located.
668 # The recommended usage here is to use the Sysinternals junction tool
669 # to create a hard link between an "openssl-1.x" sub-directory of the
670 # Fossil source code directory and the target OpenSSL source directory.
671 #
672 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
673 OPENSSLINCDIR = $(OPENSSLDIR)/include
674 OPENSSLLIBDIR = $(OPENSSLDIR)
675
676 #### Either the directory where the Tcl library is installed or the Tcl
677 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
1497 !ifndef USE_SEE
1498 USE_SEE = 0
1499 !endif
1500
1501 !if $(FOSSIL_ENABLE_SSL)!=0
1502 SSLDIR = $(B)\compat\openssl-1.1.0
1503 SSLINCDIR = $(SSLDIR)\inc32
1504 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1505 SSLLIBDIR = $(SSLDIR)\out32dll
1506 !else
1507 SSLLIBDIR = $(SSLDIR)\out32
1508
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667 #### The directories where the OpenSSL include and library files are located.
668 # The recommended usage here is to use the Sysinternals junction tool
669 # to create a hard link between an "openssl-1.x" sub-directory of the
670 # Fossil source code directory and the target OpenSSL source directory.
671 #
672 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
673 OPENSSLINCDIR = $(OPENSSLDIR)/include
674 OPENSSLLIBDIR = $(OPENSSLDIR)
675
676 #### Either the directory where the Tcl library is installed or the Tcl
677 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
1497 !ifndef USE_SEE
1498 USE_SEE = 0
1499 !endif
1500
1501 !if $(FOSSIL_ENABLE_SSL)!=0
1502 SSLDIR = $(B)\compat\openssl-1.1.0a
1503 SSLINCDIR = $(SSLDIR)\inc32
1504 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1505 SSLLIBDIR = $(SSLDIR)\out32dll
1506 !else
1507 SSLLIBDIR = $(SSLDIR)\out32
1508
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667667
 #### The directories where the OpenSSL include and library files are located.
668668
 # The recommended usage here is to use the Sysinternals junction tool
669669
 # to create a hard link between an "openssl-1.x" sub-directory of the
670670
 # Fossil source code directory and the target OpenSSL source directory.
671671
 #
672
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
672
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
673673
 OPENSSLINCDIR = $(OPENSSLDIR)/include
674674
 OPENSSLLIBDIR = $(OPENSSLDIR)
675675
676676
 #### Either the directory where the Tcl library is installed or the Tcl
677677
 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
14971497
 !ifndef USE_SEE
14981498
 USE_SEE = 0
14991499
 !endif
15001500
15011501
 !if $(FOSSIL_ENABLE_SSL)!=0
1502
-SSLDIR = $(B)\compat\openssl-1.1.0
1502
+SSLDIR = $(B)\compat\openssl-1.1.0a
15031503
 SSLINCDIR = $(SSLDIR)\inc32
15041504
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15051505
 SSLLIBDIR = $(SSLDIR)\out32dll
15061506
 !else
15071507
 SSLLIBDIR = $(SSLDIR)\out32
15081508
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667 #### The directories where the OpenSSL include and library files are located.
668 # The recommended usage here is to use the Sysinternals junction tool
669 # to create a hard link between an "openssl-1.x" sub-directory of the
670 # Fossil source code directory and the target OpenSSL source directory.
671 #
672 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
673 OPENSSLINCDIR = $(OPENSSLDIR)/include
674 OPENSSLLIBDIR = $(OPENSSLDIR)
675
676 #### Either the directory where the Tcl library is installed or the Tcl
677 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
1497 !ifndef USE_SEE
1498 USE_SEE = 0
1499 !endif
1500
1501 !if $(FOSSIL_ENABLE_SSL)!=0
1502 SSLDIR = $(B)\compat\openssl-1.1.0
1503 SSLINCDIR = $(SSLDIR)\inc32
1504 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1505 SSLLIBDIR = $(SSLDIR)\out32dll
1506 !else
1507 SSLLIBDIR = $(SSLDIR)\out32
1508
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -667,11 +667,11 @@
667 #### The directories where the OpenSSL include and library files are located.
668 # The recommended usage here is to use the Sysinternals junction tool
669 # to create a hard link between an "openssl-1.x" sub-directory of the
670 # Fossil source code directory and the target OpenSSL source directory.
671 #
672 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
673 OPENSSLINCDIR = $(OPENSSLDIR)/include
674 OPENSSLLIBDIR = $(OPENSSLDIR)
675
676 #### Either the directory where the Tcl library is installed or the Tcl
677 # source code directory resides (depending on the value of the macro
@@ -1497,11 +1497,11 @@
1497 !ifndef USE_SEE
1498 USE_SEE = 0
1499 !endif
1500
1501 !if $(FOSSIL_ENABLE_SSL)!=0
1502 SSLDIR = $(B)\compat\openssl-1.1.0a
1503 SSLINCDIR = $(SSLDIR)\inc32
1504 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1505 SSLLIBDIR = $(SSLDIR)\out32dll
1506 !else
1507 SSLLIBDIR = $(SSLDIR)\out32
1508
M src/th_main.c
+2 -2
--- src/th_main.c
+++ src/th_main.c
@@ -2221,11 +2221,11 @@
22212221
 ** evaluated script raising an error or calling [break]/[continue]) will
22222222
 ** cause the actual web page processing to be skipped.
22232223
 */
22242224
 int Th_WebpageHook(
22252225
 const char *zName,
2226
- unsigned cmdFlags
2226
+ unsigned int cmdFlags
22272227
 ){
22282228
 int rc = TH_OK;
22292229
 if( !Th_AreHooksEnabled() ) return rc;
22302230
 Th_FossilInit(TH_INIT_HOOK);
22312231
 Th_Store("web_name", zName);
@@ -2277,11 +2277,11 @@
22772277
 ** cause an error message to be displayed to the remote user.
22782278
 ** Currently, TH1 error messages generated by this function are ignored.
22792279
 */
22802280
 int Th_WebpageNotify(
22812281
 const char *zName,
2282
- unsigned cmdFlags
2282
+ unsigned int cmdFlags
22832283
 ){
22842284
 int rc = TH_OK;
22852285
 if( !Th_AreHooksEnabled() ) return rc;
22862286
 Th_FossilInit(TH_INIT_HOOK);
22872287
 Th_Store("web_name", zName);
22882288
--- src/th_main.c
+++ src/th_main.c
@@ -2221,11 +2221,11 @@
2221 ** evaluated script raising an error or calling [break]/[continue]) will
2222 ** cause the actual web page processing to be skipped.
2223 */
2224 int Th_WebpageHook(
2225 const char *zName,
2226 unsigned cmdFlags
2227 ){
2228 int rc = TH_OK;
2229 if( !Th_AreHooksEnabled() ) return rc;
2230 Th_FossilInit(TH_INIT_HOOK);
2231 Th_Store("web_name", zName);
@@ -2277,11 +2277,11 @@
2277 ** cause an error message to be displayed to the remote user.
2278 ** Currently, TH1 error messages generated by this function are ignored.
2279 */
2280 int Th_WebpageNotify(
2281 const char *zName,
2282 unsigned cmdFlags
2283 ){
2284 int rc = TH_OK;
2285 if( !Th_AreHooksEnabled() ) return rc;
2286 Th_FossilInit(TH_INIT_HOOK);
2287 Th_Store("web_name", zName);
2288
--- src/th_main.c
+++ src/th_main.c
@@ -2221,11 +2221,11 @@
2221 ** evaluated script raising an error or calling [break]/[continue]) will
2222 ** cause the actual web page processing to be skipped.
2223 */
2224 int Th_WebpageHook(
2225 const char *zName,
2226 unsigned int cmdFlags
2227 ){
2228 int rc = TH_OK;
2229 if( !Th_AreHooksEnabled() ) return rc;
2230 Th_FossilInit(TH_INIT_HOOK);
2231 Th_Store("web_name", zName);
@@ -2277,11 +2277,11 @@
2277 ** cause an error message to be displayed to the remote user.
2278 ** Currently, TH1 error messages generated by this function are ignored.
2279 */
2280 int Th_WebpageNotify(
2281 const char *zName,
2282 unsigned int cmdFlags
2283 ){
2284 int rc = TH_OK;
2285 if( !Th_AreHooksEnabled() ) return rc;
2286 Th_FossilInit(TH_INIT_HOOK);
2287 Th_Store("web_name", zName);
2288
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
 #### The directories where the OpenSSL include and library files are located.
171171
 # The recommended usage here is to use the Sysinternals junction tool
172172
 # to create a hard link between an "openssl-1.x" sub-directory of the
173173
 # Fossil source code directory and the target OpenSSL source directory.
174174
 #
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176176
 OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
 OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
 #### Either the directory where the Tcl library is installed or the Tcl
180180
 # source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.0a
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
M win/Makefile.msc
+27 -5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.1.0
104
-SSLINCDIR = $(SSLDIR)\include
105
-SSLLIBDIR = $(SSLDIR)
106
-SSLNMAKE = makefile all
103
+SSLDIR = $(B)\compat\openssl-1.1.0a
104
+SSLINCDIR = $(SSLDIR)\inc32
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)\out32dll
107
+!else
108
+SSLLIBDIR = $(SSLDIR)\out32
109
+!endif
107110
 SSLLFLAGS = /nologo /opt:ref /debug
108
-SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
111
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
109112
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
110113
 !message Using 'x64' platform for OpenSSL...
111114
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
112115
 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
113116
 SSLCONFIG = VC-WIN64A no-asm
114117
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
115118
 SSLCONFIG = $(SSLCONFIG) shared
116119
 !else
117120
 SSLCONFIG = $(SSLCONFIG) no-shared
121
+!endif
122
+SSLSETUP = ms\do_win64a.bat
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLNMAKE = ms\ntdll.mak all
125
+!else
126
+SSLNMAKE = ms\nt.mak all
118127
 !endif
119128
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
120129
 !if $(FOSSIL_DYNAMIC_BUILD)==0
121130
 SSLCFLAGS = -DOPENSSL_NO_SSL3
122131
 !endif
@@ -127,10 +136,16 @@
127136
 SSLCONFIG = VC-WIN64I no-asm
128137
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
129138
 SSLCONFIG = $(SSLCONFIG) shared
130139
 !else
131140
 SSLCONFIG = $(SSLCONFIG) no-shared
141
+!endif
142
+SSLSETUP = ms\do_win64i.bat
143
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
+SSLNMAKE = ms\ntdll.mak all
145
+!else
146
+SSLNMAKE = ms\nt.mak all
132147
 !endif
133148
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
134149
 !if $(FOSSIL_DYNAMIC_BUILD)==0
135150
 SSLCFLAGS = -DOPENSSL_NO_SSL3
136151
 !endif
@@ -142,10 +157,16 @@
142157
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
143158
 SSLCONFIG = $(SSLCONFIG) shared
144159
 !else
145160
 SSLCONFIG = $(SSLCONFIG) no-shared
146161
 !endif
162
+SSLSETUP = ms\do_ms.bat
163
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
+SSLNMAKE = ms\ntdll.mak all
165
+!else
166
+SSLNMAKE = ms\nt.mak all
167
+!endif
147168
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
148169
 !if $(FOSSIL_DYNAMIC_BUILD)==0
149170
 SSLCFLAGS = -DOPENSSL_NO_SSL3
150171
 !endif
151172
 !endif
@@ -652,10 +673,11 @@
652673
 @echo Building OpenSSL from "$(SSLDIR)"...
653674
 !if "$(PERLDIR)" != ""
654675
 @set PATH=$(PERLDIR);$(PATH)
655676
 !endif
656677
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
678
+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
657679
 !if $(FOSSIL_ENABLE_WINXP)!=0
658680
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
659681
 !else
660682
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
661683
 !endif
662684
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0
104 SSLINCDIR = $(SSLDIR)\include
105 SSLLIBDIR = $(SSLDIR)
106 SSLNMAKE = makefile all
 
 
 
107 SSLLFLAGS = /nologo /opt:ref /debug
108 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
109 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
110 !message Using 'x64' platform for OpenSSL...
111 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
112 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
113 SSLCONFIG = VC-WIN64A no-asm
114 !if $(FOSSIL_DYNAMIC_BUILD)!=0
115 SSLCONFIG = $(SSLCONFIG) shared
116 !else
117 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
118 !endif
119 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
120 !if $(FOSSIL_DYNAMIC_BUILD)==0
121 SSLCFLAGS = -DOPENSSL_NO_SSL3
122 !endif
@@ -127,10 +136,16 @@
127 SSLCONFIG = VC-WIN64I no-asm
128 !if $(FOSSIL_DYNAMIC_BUILD)!=0
129 SSLCONFIG = $(SSLCONFIG) shared
130 !else
131 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
132 !endif
133 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
134 !if $(FOSSIL_DYNAMIC_BUILD)==0
135 SSLCFLAGS = -DOPENSSL_NO_SSL3
136 !endif
@@ -142,10 +157,16 @@
142 !if $(FOSSIL_DYNAMIC_BUILD)!=0
143 SSLCONFIG = $(SSLCONFIG) shared
144 !else
145 SSLCONFIG = $(SSLCONFIG) no-shared
146 !endif
 
 
 
 
 
 
147 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
148 !if $(FOSSIL_DYNAMIC_BUILD)==0
149 SSLCFLAGS = -DOPENSSL_NO_SSL3
150 !endif
151 !endif
@@ -652,10 +673,11 @@
652 @echo Building OpenSSL from "$(SSLDIR)"...
653 !if "$(PERLDIR)" != ""
654 @set PATH=$(PERLDIR);$(PATH)
655 !endif
656 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
657 !if $(FOSSIL_ENABLE_WINXP)!=0
658 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
659 !else
660 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
661 !endif
662
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0a
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
@@ -127,10 +136,16 @@
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
@@ -142,10 +157,16 @@
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3
171 !endif
172 !endif
@@ -652,10 +673,11 @@
673 @echo Building OpenSSL from "$(SSLDIR)"...
674 !if "$(PERLDIR)" != ""
675 @set PATH=$(PERLDIR);$(PATH)
676 !endif
677 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
678 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
679 !if $(FOSSIL_ENABLE_WINXP)!=0
680 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
681 !else
682 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
683 !endif
684
M win/Makefile.msc
+27 -5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.1.0
104
-SSLINCDIR = $(SSLDIR)\include
105
-SSLLIBDIR = $(SSLDIR)
106
-SSLNMAKE = makefile all
103
+SSLDIR = $(B)\compat\openssl-1.1.0a
104
+SSLINCDIR = $(SSLDIR)\inc32
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)\out32dll
107
+!else
108
+SSLLIBDIR = $(SSLDIR)\out32
109
+!endif
107110
 SSLLFLAGS = /nologo /opt:ref /debug
108
-SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
111
+SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
109112
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
110113
 !message Using 'x64' platform for OpenSSL...
111114
 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
112115
 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
113116
 SSLCONFIG = VC-WIN64A no-asm
114117
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
115118
 SSLCONFIG = $(SSLCONFIG) shared
116119
 !else
117120
 SSLCONFIG = $(SSLCONFIG) no-shared
121
+!endif
122
+SSLSETUP = ms\do_win64a.bat
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLNMAKE = ms\ntdll.mak all
125
+!else
126
+SSLNMAKE = ms\nt.mak all
118127
 !endif
119128
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
120129
 !if $(FOSSIL_DYNAMIC_BUILD)==0
121130
 SSLCFLAGS = -DOPENSSL_NO_SSL3
122131
 !endif
@@ -127,10 +136,16 @@
127136
 SSLCONFIG = VC-WIN64I no-asm
128137
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
129138
 SSLCONFIG = $(SSLCONFIG) shared
130139
 !else
131140
 SSLCONFIG = $(SSLCONFIG) no-shared
141
+!endif
142
+SSLSETUP = ms\do_win64i.bat
143
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
+SSLNMAKE = ms\ntdll.mak all
145
+!else
146
+SSLNMAKE = ms\nt.mak all
132147
 !endif
133148
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
134149
 !if $(FOSSIL_DYNAMIC_BUILD)==0
135150
 SSLCFLAGS = -DOPENSSL_NO_SSL3
136151
 !endif
@@ -142,10 +157,16 @@
142157
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
143158
 SSLCONFIG = $(SSLCONFIG) shared
144159
 !else
145160
 SSLCONFIG = $(SSLCONFIG) no-shared
146161
 !endif
162
+SSLSETUP = ms\do_ms.bat
163
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
+SSLNMAKE = ms\ntdll.mak all
165
+!else
166
+SSLNMAKE = ms\nt.mak all
167
+!endif
147168
 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
148169
 !if $(FOSSIL_DYNAMIC_BUILD)==0
149170
 SSLCFLAGS = -DOPENSSL_NO_SSL3
150171
 !endif
151172
 !endif
@@ -652,10 +673,11 @@
652673
 @echo Building OpenSSL from "$(SSLDIR)"...
653674
 !if "$(PERLDIR)" != ""
654675
 @set PATH=$(PERLDIR);$(PATH)
655676
 !endif
656677
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
678
+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
657679
 !if $(FOSSIL_ENABLE_WINXP)!=0
658680
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
659681
 !else
660682
 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
661683
 !endif
662684
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0
104 SSLINCDIR = $(SSLDIR)\include
105 SSLLIBDIR = $(SSLDIR)
106 SSLNMAKE = makefile all
 
 
 
107 SSLLFLAGS = /nologo /opt:ref /debug
108 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
109 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
110 !message Using 'x64' platform for OpenSSL...
111 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
112 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
113 SSLCONFIG = VC-WIN64A no-asm
114 !if $(FOSSIL_DYNAMIC_BUILD)!=0
115 SSLCONFIG = $(SSLCONFIG) shared
116 !else
117 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
118 !endif
119 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
120 !if $(FOSSIL_DYNAMIC_BUILD)==0
121 SSLCFLAGS = -DOPENSSL_NO_SSL3
122 !endif
@@ -127,10 +136,16 @@
127 SSLCONFIG = VC-WIN64I no-asm
128 !if $(FOSSIL_DYNAMIC_BUILD)!=0
129 SSLCONFIG = $(SSLCONFIG) shared
130 !else
131 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
132 !endif
133 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
134 !if $(FOSSIL_DYNAMIC_BUILD)==0
135 SSLCFLAGS = -DOPENSSL_NO_SSL3
136 !endif
@@ -142,10 +157,16 @@
142 !if $(FOSSIL_DYNAMIC_BUILD)!=0
143 SSLCONFIG = $(SSLCONFIG) shared
144 !else
145 SSLCONFIG = $(SSLCONFIG) no-shared
146 !endif
 
 
 
 
 
 
147 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
148 !if $(FOSSIL_DYNAMIC_BUILD)==0
149 SSLCFLAGS = -DOPENSSL_NO_SSL3
150 !endif
151 !endif
@@ -652,10 +673,11 @@
652 @echo Building OpenSSL from "$(SSLDIR)"...
653 !if "$(PERLDIR)" != ""
654 @set PATH=$(PERLDIR);$(PATH)
655 !endif
656 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
657 !if $(FOSSIL_ENABLE_WINXP)!=0
658 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
659 !else
660 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
661 !endif
662
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,25 +98,34 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.0a
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 # BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115 # SSLCONFIG = VC-WIN64A no-asm no-ssl3
116 SSLCONFIG = VC-WIN64A no-asm
117 !if $(FOSSIL_DYNAMIC_BUILD)!=0
118 SSLCONFIG = $(SSLCONFIG) shared
119 !else
120 SSLCONFIG = $(SSLCONFIG) no-shared
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
125 !else
126 SSLNMAKE = ms\nt.mak all
127 !endif
128 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129 !if $(FOSSIL_DYNAMIC_BUILD)==0
130 SSLCFLAGS = -DOPENSSL_NO_SSL3
131 !endif
@@ -127,10 +136,16 @@
136 SSLCONFIG = VC-WIN64I no-asm
137 !if $(FOSSIL_DYNAMIC_BUILD)!=0
138 SSLCONFIG = $(SSLCONFIG) shared
139 !else
140 SSLCONFIG = $(SSLCONFIG) no-shared
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
145 !else
146 SSLNMAKE = ms\nt.mak all
147 !endif
148 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149 !if $(FOSSIL_DYNAMIC_BUILD)==0
150 SSLCFLAGS = -DOPENSSL_NO_SSL3
151 !endif
@@ -142,10 +157,16 @@
157 !if $(FOSSIL_DYNAMIC_BUILD)!=0
158 SSLCONFIG = $(SSLCONFIG) shared
159 !else
160 SSLCONFIG = $(SSLCONFIG) no-shared
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
165 !else
166 SSLNMAKE = ms\nt.mak all
167 !endif
168 # BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169 !if $(FOSSIL_DYNAMIC_BUILD)==0
170 SSLCFLAGS = -DOPENSSL_NO_SSL3
171 !endif
172 !endif
@@ -652,10 +673,11 @@
673 @echo Building OpenSSL from "$(SSLDIR)"...
674 !if "$(PERLDIR)" != ""
675 @set PATH=$(PERLDIR);$(PATH)
676 !endif
677 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
678 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
679 !if $(FOSSIL_ENABLE_WINXP)!=0
680 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
681 !else
682 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
683 !endif
684
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141141
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142142
 first <a href="https://www.openssl.org/source/">download the official
143143
 source code for OpenSSL</a> and extract it to an appropriately named
144144
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145145
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146
-"<b>compat/openssl-1.1.0</b>"), then make sure that some recent
146
+"<b>compat/openssl-1.1.0a</b>"), then make sure that some recent
147147
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148148
 and finally run one of the following commands:
149149
 <blockquote><pre>
150150
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151151
 </pre></blockquote>
152152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.1.0</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.1.0a</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141141
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142142
 first <a href="https://www.openssl.org/source/">download the official
143143
 source code for OpenSSL</a> and extract it to an appropriately named
144144
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145145
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146
-"<b>compat/openssl-1.1.0</b>"), then make sure that some recent
146
+"<b>compat/openssl-1.1.0a</b>"), then make sure that some recent
147147
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148148
 and finally run one of the following commands:
149149
 <blockquote><pre>
150150
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151151
 </pre></blockquote>
152152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.1.0</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.1.0a</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152

Keyboard Shortcuts

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