Fossil SCM

Merge updates from trunk.

mistachkin 2014-08-25 20:42 UTC optionalMiniz merge
Commit e38b1ab08775744b32b5757368269b35c865f9e0
Parent 3d8431045399d97…
4 files changed +28 -12 +28 -12 +28 -12 +28 -12
~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.msc ~ win/Makefile.msc
M src/makemake.tcl
+28 -12
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
11241124
 #
11251125
 # This file is automatically generated. Instead of editing this
11261126
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
11271127
 # to regenerate this file.
11281128
 #
1129
-B = ..
1130
-SRCDIR = $B\src
1131
-OBJDIR = .
1132
-OX = .
1133
-O = .obj
1134
-E = .exe
1135
-P = .pdb
1129
+B = ..
1130
+SRCDIR = $B\src
1131
+OBJDIR = .
1132
+OX = .
1133
+O = .obj
1134
+E = .exe
1135
+P = .pdb
1136
+PERLDIR =
1137
+PERL = perl.exe
11361138
11371139
 # Uncomment to enable debug symbols
11381140
 # DEBUG = 1
11391141
11401142
 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
11511153
11521154
 # Uncomment to enable Tcl support
11531155
 # FOSSIL_ENABLE_TCL = 1
11541156
11551157
 !ifdef FOSSIL_ENABLE_SSL
1156
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1157
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
1158
+SSLDIR = $(B)\compat\openssl-1.0.1i
1159
+SSLINCDIR = $(SSLDIR)\include
1160
+SSLLIBDIR = $(SSLDIR)\out32
11581161
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
11591162
 !endif
11601163
11611164
 !ifdef FOSSIL_ENABLE_TCL
11621165
 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
12851288
12861289
 zlib:
12871290
 @echo Building zlib from "$(ZLIBDIR)"...
12881291
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
12891292
1290
-EXTRATARGET =
1293
+!ifdef FOSSIL_ENABLE_SSL
1294
+openssl:
1295
+ @echo Building OpenSSL from "$(SSLDIR)"...
1296
+!if "$(PERLDIR)" != ""
1297
+ @set PATH=$(PERLDIR);$(PATH)
1298
+!endif
1299
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302
+!endif
12911303
12921304
 !ifndef FOSSIL_ENABLE_MINIZ
1293
-EXTRATARGET = $(EXTRATARGET) zlib
1305
+EXTRATARGETS = $(EXTRATARGETS) zlib
1306
+!endif
1307
+
1308
+!ifdef FOSSIL_ENABLE_SSL
1309
+EXTRATARGETS = $(EXTRATARGETS) openssl
12941310
 !endif
12951311
1296
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
1312
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
12971313
 cd $(OX)
12981314
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
12991315
13001316
 $(OX)\linkopts: $B\win\Makefile.msc}
13011317
 set redir {>}
13021318
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
1124 #
1125 # This file is automatically generated. Instead of editing this
1126 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1127 # to regenerate this file.
1128 #
1129 B = ..
1130 SRCDIR = $B\src
1131 OBJDIR = .
1132 OX = .
1133 O = .obj
1134 E = .exe
1135 P = .pdb
 
 
1136
1137 # Uncomment to enable debug symbols
1138 # DEBUG = 1
1139
1140 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
1151
1152 # Uncomment to enable Tcl support
1153 # FOSSIL_ENABLE_TCL = 1
1154
1155 !ifdef FOSSIL_ENABLE_SSL
1156 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1157 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
1158 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1159 !endif
1160
1161 !ifdef FOSSIL_ENABLE_TCL
1162 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
1285
1286 zlib:
1287 @echo Building zlib from "$(ZLIBDIR)"...
1288 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1289
1290 EXTRATARGET =
 
 
 
 
 
 
 
 
 
1291
1292 !ifndef FOSSIL_ENABLE_MINIZ
1293 EXTRATARGET = $(EXTRATARGET) zlib
 
 
 
 
1294 !endif
1295
1296 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
1297 cd $(OX)
1298 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1299
1300 $(OX)\linkopts: $B\win\Makefile.msc}
1301 set redir {>}
1302
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
1124 #
1125 # This file is automatically generated. Instead of editing this
1126 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1127 # to regenerate this file.
1128 #
1129 B = ..
1130 SRCDIR = $B\src
1131 OBJDIR = .
1132 OX = .
1133 O = .obj
1134 E = .exe
1135 P = .pdb
1136 PERLDIR =
1137 PERL = perl.exe
1138
1139 # Uncomment to enable debug symbols
1140 # DEBUG = 1
1141
1142 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
1153
1154 # Uncomment to enable Tcl support
1155 # FOSSIL_ENABLE_TCL = 1
1156
1157 !ifdef FOSSIL_ENABLE_SSL
1158 SSLDIR = $(B)\compat\openssl-1.0.1i
1159 SSLINCDIR = $(SSLDIR)\include
1160 SSLLIBDIR = $(SSLDIR)\out32
1161 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1162 !endif
1163
1164 !ifdef FOSSIL_ENABLE_TCL
1165 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
1288
1289 zlib:
1290 @echo Building zlib from "$(ZLIBDIR)"...
1291 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1292
1293 !ifdef FOSSIL_ENABLE_SSL
1294 openssl:
1295 @echo Building OpenSSL from "$(SSLDIR)"...
1296 !if "$(PERLDIR)" != ""
1297 @set PATH=$(PERLDIR);$(PATH)
1298 !endif
1299 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302 !endif
1303
1304 !ifndef FOSSIL_ENABLE_MINIZ
1305 EXTRATARGETS = $(EXTRATARGETS) zlib
1306 !endif
1307
1308 !ifdef FOSSIL_ENABLE_SSL
1309 EXTRATARGETS = $(EXTRATARGETS) openssl
1310 !endif
1311
1312 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1313 cd $(OX)
1314 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1315
1316 $(OX)\linkopts: $B\win\Makefile.msc}
1317 set redir {>}
1318
M src/makemake.tcl
+28 -12
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
11241124
 #
11251125
 # This file is automatically generated. Instead of editing this
11261126
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
11271127
 # to regenerate this file.
11281128
 #
1129
-B = ..
1130
-SRCDIR = $B\src
1131
-OBJDIR = .
1132
-OX = .
1133
-O = .obj
1134
-E = .exe
1135
-P = .pdb
1129
+B = ..
1130
+SRCDIR = $B\src
1131
+OBJDIR = .
1132
+OX = .
1133
+O = .obj
1134
+E = .exe
1135
+P = .pdb
1136
+PERLDIR =
1137
+PERL = perl.exe
11361138
11371139
 # Uncomment to enable debug symbols
11381140
 # DEBUG = 1
11391141
11401142
 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
11511153
11521154
 # Uncomment to enable Tcl support
11531155
 # FOSSIL_ENABLE_TCL = 1
11541156
11551157
 !ifdef FOSSIL_ENABLE_SSL
1156
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1157
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
1158
+SSLDIR = $(B)\compat\openssl-1.0.1i
1159
+SSLINCDIR = $(SSLDIR)\include
1160
+SSLLIBDIR = $(SSLDIR)\out32
11581161
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
11591162
 !endif
11601163
11611164
 !ifdef FOSSIL_ENABLE_TCL
11621165
 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
12851288
12861289
 zlib:
12871290
 @echo Building zlib from "$(ZLIBDIR)"...
12881291
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
12891292
1290
-EXTRATARGET =
1293
+!ifdef FOSSIL_ENABLE_SSL
1294
+openssl:
1295
+ @echo Building OpenSSL from "$(SSLDIR)"...
1296
+!if "$(PERLDIR)" != ""
1297
+ @set PATH=$(PERLDIR);$(PATH)
1298
+!endif
1299
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302
+!endif
12911303
12921304
 !ifndef FOSSIL_ENABLE_MINIZ
1293
-EXTRATARGET = $(EXTRATARGET) zlib
1305
+EXTRATARGETS = $(EXTRATARGETS) zlib
1306
+!endif
1307
+
1308
+!ifdef FOSSIL_ENABLE_SSL
1309
+EXTRATARGETS = $(EXTRATARGETS) openssl
12941310
 !endif
12951311
1296
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
1312
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
12971313
 cd $(OX)
12981314
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
12991315
13001316
 $(OX)\linkopts: $B\win\Makefile.msc}
13011317
 set redir {>}
13021318
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
1124 #
1125 # This file is automatically generated. Instead of editing this
1126 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1127 # to regenerate this file.
1128 #
1129 B = ..
1130 SRCDIR = $B\src
1131 OBJDIR = .
1132 OX = .
1133 O = .obj
1134 E = .exe
1135 P = .pdb
 
 
1136
1137 # Uncomment to enable debug symbols
1138 # DEBUG = 1
1139
1140 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
1151
1152 # Uncomment to enable Tcl support
1153 # FOSSIL_ENABLE_TCL = 1
1154
1155 !ifdef FOSSIL_ENABLE_SSL
1156 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1157 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
1158 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1159 !endif
1160
1161 !ifdef FOSSIL_ENABLE_TCL
1162 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
1285
1286 zlib:
1287 @echo Building zlib from "$(ZLIBDIR)"...
1288 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1289
1290 EXTRATARGET =
 
 
 
 
 
 
 
 
 
1291
1292 !ifndef FOSSIL_ENABLE_MINIZ
1293 EXTRATARGET = $(EXTRATARGET) zlib
 
 
 
 
1294 !endif
1295
1296 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
1297 cd $(OX)
1298 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1299
1300 $(OX)\linkopts: $B\win\Makefile.msc}
1301 set redir {>}
1302
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1124,17 +1124,19 @@
1124 #
1125 # This file is automatically generated. Instead of editing this
1126 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1127 # to regenerate this file.
1128 #
1129 B = ..
1130 SRCDIR = $B\src
1131 OBJDIR = .
1132 OX = .
1133 O = .obj
1134 E = .exe
1135 P = .pdb
1136 PERLDIR =
1137 PERL = perl.exe
1138
1139 # Uncomment to enable debug symbols
1140 # DEBUG = 1
1141
1142 # Uncomment to enable JSON API
@@ -1151,12 +1153,13 @@
1153
1154 # Uncomment to enable Tcl support
1155 # FOSSIL_ENABLE_TCL = 1
1156
1157 !ifdef FOSSIL_ENABLE_SSL
1158 SSLDIR = $(B)\compat\openssl-1.0.1i
1159 SSLINCDIR = $(SSLDIR)\include
1160 SSLLIBDIR = $(SSLDIR)\out32
1161 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1162 !endif
1163
1164 !ifdef FOSSIL_ENABLE_TCL
1165 TCLDIR = $(B)\compat\tcl-8.6
@@ -1285,17 +1288,30 @@
1288
1289 zlib:
1290 @echo Building zlib from "$(ZLIBDIR)"...
1291 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
1292
1293 !ifdef FOSSIL_ENABLE_SSL
1294 openssl:
1295 @echo Building OpenSSL from "$(SSLDIR)"...
1296 !if "$(PERLDIR)" != ""
1297 @set PATH=$(PERLDIR);$(PATH)
1298 !endif
1299 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1300 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1302 !endif
1303
1304 !ifndef FOSSIL_ENABLE_MINIZ
1305 EXTRATARGETS = $(EXTRATARGETS) zlib
1306 !endif
1307
1308 !ifdef FOSSIL_ENABLE_SSL
1309 EXTRATARGETS = $(EXTRATARGETS) openssl
1310 !endif
1311
1312 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1313 cd $(OX)
1314 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1315
1316 $(OX)\linkopts: $B\win\Makefile.msc}
1317 set redir {>}
1318
M win/Makefile.msc
+28 -12
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
55
 #
66
 # This file is automatically generated. Instead of editing this
77
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
88
 # to regenerate this file.
99
 #
10
-B = ..
11
-SRCDIR = $B\src
12
-OBJDIR = .
13
-OX = .
14
-O = .obj
15
-E = .exe
16
-P = .pdb
10
+B = ..
11
+SRCDIR = $B\src
12
+OBJDIR = .
13
+OX = .
14
+O = .obj
15
+E = .exe
16
+P = .pdb
17
+PERLDIR =
18
+PERL = perl.exe
1719
1820
 # Uncomment to enable debug symbols
1921
 # DEBUG = 1
2022
2123
 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
3234
3335
 # Uncomment to enable Tcl support
3436
 # FOSSIL_ENABLE_TCL = 1
3537
3638
 !ifdef FOSSIL_ENABLE_SSL
37
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
38
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
39
+SSLDIR = $(B)\compat\openssl-1.0.1i
40
+SSLINCDIR = $(SSLDIR)\include
41
+SSLLIBDIR = $(SSLDIR)\out32
3942
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
4043
 !endif
4144
4245
 !ifdef FOSSIL_ENABLE_TCL
4346
 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
382385
383386
 zlib:
384387
 @echo Building zlib from "$(ZLIBDIR)"...
385388
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
386389
387
-EXTRATARGET =
390
+!ifdef FOSSIL_ENABLE_SSL
391
+openssl:
392
+ @echo Building OpenSSL from "$(SSLDIR)"...
393
+!if "$(PERLDIR)" != ""
394
+ @set PATH=$(PERLDIR);$(PATH)
395
+!endif
396
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399
+!endif
388400
389401
 !ifndef FOSSIL_ENABLE_MINIZ
390
-EXTRATARGET = $(EXTRATARGET) zlib
402
+EXTRATARGETS = $(EXTRATARGETS) zlib
403
+!endif
404
+
405
+!ifdef FOSSIL_ENABLE_SSL
406
+EXTRATARGETS = $(EXTRATARGETS) openssl
391407
 !endif
392408
393
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
409
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
394410
 cd $(OX)
395411
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
396412
397413
 $(OX)\linkopts: $B\win\Makefile.msc
398414
 echo $(OX)\add.obj > $@
399415
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
5 #
6 # This file is automatically generated. Instead of editing this
7 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8 # to regenerate this file.
9 #
10 B = ..
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
 
 
17
18 # Uncomment to enable debug symbols
19 # DEBUG = 1
20
21 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
32
33 # Uncomment to enable Tcl support
34 # FOSSIL_ENABLE_TCL = 1
35
36 !ifdef FOSSIL_ENABLE_SSL
37 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
38 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
39 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
40 !endif
41
42 !ifdef FOSSIL_ENABLE_TCL
43 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
382
383 zlib:
384 @echo Building zlib from "$(ZLIBDIR)"...
385 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
386
387 EXTRATARGET =
 
 
 
 
 
 
 
 
 
388
389 !ifndef FOSSIL_ENABLE_MINIZ
390 EXTRATARGET = $(EXTRATARGET) zlib
 
 
 
 
391 !endif
392
393 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
394 cd $(OX)
395 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
396
397 $(OX)\linkopts: $B\win\Makefile.msc
398 echo $(OX)\add.obj > $@
399
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
5 #
6 # This file is automatically generated. Instead of editing this
7 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8 # to regenerate this file.
9 #
10 B = ..
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
17 PERLDIR =
18 PERL = perl.exe
19
20 # Uncomment to enable debug symbols
21 # DEBUG = 1
22
23 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
34
35 # Uncomment to enable Tcl support
36 # FOSSIL_ENABLE_TCL = 1
37
38 !ifdef FOSSIL_ENABLE_SSL
39 SSLDIR = $(B)\compat\openssl-1.0.1i
40 SSLINCDIR = $(SSLDIR)\include
41 SSLLIBDIR = $(SSLDIR)\out32
42 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
43 !endif
44
45 !ifdef FOSSIL_ENABLE_TCL
46 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
385
386 zlib:
387 @echo Building zlib from "$(ZLIBDIR)"...
388 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
389
390 !ifdef FOSSIL_ENABLE_SSL
391 openssl:
392 @echo Building OpenSSL from "$(SSLDIR)"...
393 !if "$(PERLDIR)" != ""
394 @set PATH=$(PERLDIR);$(PATH)
395 !endif
396 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399 !endif
400
401 !ifndef FOSSIL_ENABLE_MINIZ
402 EXTRATARGETS = $(EXTRATARGETS) zlib
403 !endif
404
405 !ifdef FOSSIL_ENABLE_SSL
406 EXTRATARGETS = $(EXTRATARGETS) openssl
407 !endif
408
409 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
410 cd $(OX)
411 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
412
413 $(OX)\linkopts: $B\win\Makefile.msc
414 echo $(OX)\add.obj > $@
415
M win/Makefile.msc
+28 -12
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
55
 #
66
 # This file is automatically generated. Instead of editing this
77
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
88
 # to regenerate this file.
99
 #
10
-B = ..
11
-SRCDIR = $B\src
12
-OBJDIR = .
13
-OX = .
14
-O = .obj
15
-E = .exe
16
-P = .pdb
10
+B = ..
11
+SRCDIR = $B\src
12
+OBJDIR = .
13
+OX = .
14
+O = .obj
15
+E = .exe
16
+P = .pdb
17
+PERLDIR =
18
+PERL = perl.exe
1719
1820
 # Uncomment to enable debug symbols
1921
 # DEBUG = 1
2022
2123
 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
3234
3335
 # Uncomment to enable Tcl support
3436
 # FOSSIL_ENABLE_TCL = 1
3537
3638
 !ifdef FOSSIL_ENABLE_SSL
37
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
38
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
39
+SSLDIR = $(B)\compat\openssl-1.0.1i
40
+SSLINCDIR = $(SSLDIR)\include
41
+SSLLIBDIR = $(SSLDIR)\out32
3942
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
4043
 !endif
4144
4245
 !ifdef FOSSIL_ENABLE_TCL
4346
 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
382385
383386
 zlib:
384387
 @echo Building zlib from "$(ZLIBDIR)"...
385388
 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
386389
387
-EXTRATARGET =
390
+!ifdef FOSSIL_ENABLE_SSL
391
+openssl:
392
+ @echo Building OpenSSL from "$(SSLDIR)"...
393
+!if "$(PERLDIR)" != ""
394
+ @set PATH=$(PERLDIR);$(PATH)
395
+!endif
396
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399
+!endif
388400
389401
 !ifndef FOSSIL_ENABLE_MINIZ
390
-EXTRATARGET = $(EXTRATARGET) zlib
402
+EXTRATARGETS = $(EXTRATARGETS) zlib
403
+!endif
404
+
405
+!ifdef FOSSIL_ENABLE_SSL
406
+EXTRATARGETS = $(EXTRATARGETS) openssl
391407
 !endif
392408
393
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
409
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
394410
 cd $(OX)
395411
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
396412
397413
 $(OX)\linkopts: $B\win\Makefile.msc
398414
 echo $(OX)\add.obj > $@
399415
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
5 #
6 # This file is automatically generated. Instead of editing this
7 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8 # to regenerate this file.
9 #
10 B = ..
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
 
 
17
18 # Uncomment to enable debug symbols
19 # DEBUG = 1
20
21 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
32
33 # Uncomment to enable Tcl support
34 # FOSSIL_ENABLE_TCL = 1
35
36 !ifdef FOSSIL_ENABLE_SSL
37 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
38 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
39 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
40 !endif
41
42 !ifdef FOSSIL_ENABLE_TCL
43 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
382
383 zlib:
384 @echo Building zlib from "$(ZLIBDIR)"...
385 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
386
387 EXTRATARGET =
 
 
 
 
 
 
 
 
 
388
389 !ifndef FOSSIL_ENABLE_MINIZ
390 EXTRATARGET = $(EXTRATARGET) zlib
 
 
 
 
391 !endif
392
393 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGET)
394 cd $(OX)
395 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
396
397 $(OX)\linkopts: $B\win\Makefile.msc
398 echo $(OX)\add.obj > $@
399
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -5,17 +5,19 @@
5 #
6 # This file is automatically generated. Instead of editing this
7 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8 # to regenerate this file.
9 #
10 B = ..
11 SRCDIR = $B\src
12 OBJDIR = .
13 OX = .
14 O = .obj
15 E = .exe
16 P = .pdb
17 PERLDIR =
18 PERL = perl.exe
19
20 # Uncomment to enable debug symbols
21 # DEBUG = 1
22
23 # Uncomment to enable JSON API
@@ -32,12 +34,13 @@
34
35 # Uncomment to enable Tcl support
36 # FOSSIL_ENABLE_TCL = 1
37
38 !ifdef FOSSIL_ENABLE_SSL
39 SSLDIR = $(B)\compat\openssl-1.0.1i
40 SSLINCDIR = $(SSLDIR)\include
41 SSLLIBDIR = $(SSLDIR)\out32
42 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
43 !endif
44
45 !ifdef FOSSIL_ENABLE_TCL
46 TCLDIR = $(B)\compat\tcl-8.6
@@ -382,17 +385,30 @@
385
386 zlib:
387 @echo Building zlib from "$(ZLIBDIR)"...
388 @pushd "$(ZLIBDIR)" && $(MAKE) /f win32\Makefile.msc $(ZLIB) && popd
389
390 !ifdef FOSSIL_ENABLE_SSL
391 openssl:
392 @echo Building OpenSSL from "$(SSLDIR)"...
393 !if "$(PERLDIR)" != ""
394 @set PATH=$(PERLDIR);$(PATH)
395 !endif
396 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
397 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
399 !endif
400
401 !ifndef FOSSIL_ENABLE_MINIZ
402 EXTRATARGETS = $(EXTRATARGETS) zlib
403 !endif
404
405 !ifdef FOSSIL_ENABLE_SSL
406 EXTRATARGETS = $(EXTRATARGETS) openssl
407 !endif
408
409 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
410 cd $(OX)
411 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
412
413 $(OX)\linkopts: $B\win\Makefile.msc
414 echo $(OX)\add.obj > $@
415

Keyboard Shortcuts

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