Fossil SCM

When compiling with MSVC, enable building of OpenSSL automatically when SSL is enabled.

mistachkin 2014-08-25 20:38 trunk
Commit bdf9c708075dbe6c15874b1bdc1edc47b5b794b3
Parent ee46563cbdc28fa…
2 files changed +30 -10 +30 -10
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+30 -10
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1033,17 +1033,19 @@
10331033
 #
10341034
 # This file is automatically generated. Instead of editing this
10351035
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
10361036
 # to regenerate this file.
10371037
 #
1038
-B = ..
1039
-SRCDIR = $B\src
1040
-OBJDIR = .
1041
-OX = .
1042
-O = .obj
1043
-E = .exe
1044
-P = .pdb
1038
+B = ..
1039
+SRCDIR = $B\src
1040
+OBJDIR = .
1041
+OX = .
1042
+O = .obj
1043
+E = .exe
1044
+P = .pdb
1045
+PERLDIR =
1046
+PERL = perl.exe
10451047
10461048
 # Uncomment to enable debug symbols
10471049
 # DEBUG = 1
10481050
10491051
 # Uncomment to enable JSON API
@@ -1057,12 +1059,13 @@
10571059
10581060
 # Uncomment to enable Tcl support
10591061
 # FOSSIL_ENABLE_TCL = 1
10601062
10611063
 !ifdef FOSSIL_ENABLE_SSL
1062
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1063
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
1064
+SSLDIR = $(B)\compat\openssl-1.0.1i
1065
+SSLINCDIR = $(SSLDIR)\include
1066
+SSLLIBDIR = $(SSLDIR)\out32
10641067
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10651068
 !endif
10661069
10671070
 !ifdef FOSSIL_ENABLE_TCL
10681071
 TCLDIR = $(B)\compat\tcl-8.6
@@ -1167,11 +1170,28 @@
11671170
11681171
 zlib:
11691172
 @echo Building zlib from "$(ZLIBDIR)"...
11701173
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
11711174
1172
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
1175
+!ifdef FOSSIL_ENABLE_SSL
1176
+openssl:
1177
+ @echo Building OpenSSL from "$(SSLDIR)"...
1178
+!if "$(PERLDIR)" != ""
1179
+ @set PATH=$(PERLDIR);$(PATH)
1180
+!endif
1181
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1182
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1183
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1184
+!endif
1185
+
1186
+EXTRATARGETS = $(EXTRATARGETS) zlib
1187
+
1188
+!ifdef FOSSIL_ENABLE_SSL
1189
+EXTRATARGETS = $(EXTRATARGETS) openssl
1190
+!endif
1191
+
1192
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
11731193
 cd $(OX)
11741194
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
11751195
11761196
 $(OX)\linkopts: $B\win\Makefile.msc}
11771197
 set redir {>}
11781198
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1033,17 +1033,19 @@
1033 #
1034 # This file is automatically generated. Instead of editing this
1035 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1036 # to regenerate this file.
1037 #
1038 B = ..
1039 SRCDIR = $B\src
1040 OBJDIR = .
1041 OX = .
1042 O = .obj
1043 E = .exe
1044 P = .pdb
 
 
1045
1046 # Uncomment to enable debug symbols
1047 # DEBUG = 1
1048
1049 # Uncomment to enable JSON API
@@ -1057,12 +1059,13 @@
1057
1058 # Uncomment to enable Tcl support
1059 # FOSSIL_ENABLE_TCL = 1
1060
1061 !ifdef FOSSIL_ENABLE_SSL
1062 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1063 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
1064 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1065 !endif
1066
1067 !ifdef FOSSIL_ENABLE_TCL
1068 TCLDIR = $(B)\compat\tcl-8.6
@@ -1167,11 +1170,28 @@
1167
1168 zlib:
1169 @echo Building zlib from "$(ZLIBDIR)"...
1170 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1171
1172 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1173 cd $(OX)
1174 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1175
1176 $(OX)\linkopts: $B\win\Makefile.msc}
1177 set redir {>}
1178
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1033,17 +1033,19 @@
1033 #
1034 # This file is automatically generated. Instead of editing this
1035 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1036 # to regenerate this file.
1037 #
1038 B = ..
1039 SRCDIR = $B\src
1040 OBJDIR = .
1041 OX = .
1042 O = .obj
1043 E = .exe
1044 P = .pdb
1045 PERLDIR =
1046 PERL = perl.exe
1047
1048 # Uncomment to enable debug symbols
1049 # DEBUG = 1
1050
1051 # Uncomment to enable JSON API
@@ -1057,12 +1059,13 @@
1059
1060 # Uncomment to enable Tcl support
1061 # FOSSIL_ENABLE_TCL = 1
1062
1063 !ifdef FOSSIL_ENABLE_SSL
1064 SSLDIR = $(B)\compat\openssl-1.0.1i
1065 SSLINCDIR = $(SSLDIR)\include
1066 SSLLIBDIR = $(SSLDIR)\out32
1067 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1068 !endif
1069
1070 !ifdef FOSSIL_ENABLE_TCL
1071 TCLDIR = $(B)\compat\tcl-8.6
@@ -1167,11 +1170,28 @@
1170
1171 zlib:
1172 @echo Building zlib from "$(ZLIBDIR)"...
1173 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
1174
1175 !ifdef FOSSIL_ENABLE_SSL
1176 openssl:
1177 @echo Building OpenSSL from "$(SSLDIR)"...
1178 !if "$(PERLDIR)" != ""
1179 @set PATH=$(PERLDIR);$(PATH)
1180 !endif
1181 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1182 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1183 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
1184 !endif
1185
1186 EXTRATARGETS = $(EXTRATARGETS) zlib
1187
1188 !ifdef FOSSIL_ENABLE_SSL
1189 EXTRATARGETS = $(EXTRATARGETS) openssl
1190 !endif
1191
1192 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1193 cd $(OX)
1194 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1195
1196 $(OX)\linkopts: $B\win\Makefile.msc}
1197 set redir {>}
1198
M win/Makefile.msc
+30 -10
--- 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
@@ -29,12 +31,13 @@
2931
3032
 # Uncomment to enable Tcl support
3133
 # FOSSIL_ENABLE_TCL = 1
3234
3335
 !ifdef FOSSIL_ENABLE_SSL
34
-SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
35
-SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
36
+SSLDIR = $(B)\compat\openssl-1.0.1i
37
+SSLINCDIR = $(SSLDIR)\include
38
+SSLLIBDIR = $(SSLDIR)\out32
3639
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3740
 !endif
3841
3942
 !ifdef FOSSIL_ENABLE_TCL
4043
 TCLDIR = $(B)\compat\tcl-8.6
@@ -358,11 +361,28 @@
358361
359362
 zlib:
360363
 @echo Building zlib from "$(ZLIBDIR)"...
361364
 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
362365
363
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
366
+!ifdef FOSSIL_ENABLE_SSL
367
+openssl:
368
+ @echo Building OpenSSL from "$(SSLDIR)"...
369
+!if "$(PERLDIR)" != ""
370
+ @set PATH=$(PERLDIR);$(PATH)
371
+!endif
372
+ @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
373
+ @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
374
+ @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
375
+!endif
376
+
377
+EXTRATARGETS = $(EXTRATARGETS) zlib
378
+
379
+!ifdef FOSSIL_ENABLE_SSL
380
+EXTRATARGETS = $(EXTRATARGETS) openssl
381
+!endif
382
+
383
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
364384
 cd $(OX)
365385
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
366386
367387
 $(OX)\linkopts: $B\win\Makefile.msc
368388
 echo $(OX)\add.obj > $@
369389
--- 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
@@ -29,12 +31,13 @@
29
30 # Uncomment to enable Tcl support
31 # FOSSIL_ENABLE_TCL = 1
32
33 !ifdef FOSSIL_ENABLE_SSL
34 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
35 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
 
36 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
37 !endif
38
39 !ifdef FOSSIL_ENABLE_TCL
40 TCLDIR = $(B)\compat\tcl-8.6
@@ -358,11 +361,28 @@
358
359 zlib:
360 @echo Building zlib from "$(ZLIBDIR)"...
361 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
362
363 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts zlib
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
364 cd $(OX)
365 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
366
367 $(OX)\linkopts: $B\win\Makefile.msc
368 echo $(OX)\add.obj > $@
369
--- 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
@@ -29,12 +31,13 @@
31
32 # Uncomment to enable Tcl support
33 # FOSSIL_ENABLE_TCL = 1
34
35 !ifdef FOSSIL_ENABLE_SSL
36 SSLDIR = $(B)\compat\openssl-1.0.1i
37 SSLINCDIR = $(SSLDIR)\include
38 SSLLIBDIR = $(SSLDIR)\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
@@ -358,11 +361,28 @@
361
362 zlib:
363 @echo Building zlib from "$(ZLIBDIR)"...
364 @pushd "$(ZLIBDIR)" && nmake /f win32\Makefile.msc $(ZLIB) && popd
365
366 !ifdef FOSSIL_ENABLE_SSL
367 openssl:
368 @echo Building OpenSSL from "$(SSLDIR)"...
369 !if "$(PERLDIR)" != ""
370 @set PATH=$(PERLDIR);$(PATH)
371 !endif
372 @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
373 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
374 @pushd "$(SSLDIR)" && $(MAKE) -f ms\nt.mak all && popd
375 !endif
376
377 EXTRATARGETS = $(EXTRATARGETS) zlib
378
379 !ifdef FOSSIL_ENABLE_SSL
380 EXTRATARGETS = $(EXTRATARGETS) openssl
381 !endif
382
383 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
384 cd $(OX)
385 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
386
387 $(OX)\linkopts: $B\win\Makefile.msc
388 echo $(OX)\add.obj > $@
389

Keyboard Shortcuts

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