Fossil SCM

Add FOSSIL_BUILD_SSL macro to the MSVC makefile to control whether OpenSSL is built during the build process. By default, building OpenSSL during the Fossil build is off.

mistachkin 2014-09-28 20:54 trunk
Commit 80b4adddec55f6b39ba641283b1f0326b4fb9083
Parent 20af0a8e5c5cbb4…
3 files changed +5 +5 +2 -2
~ src/makemake.tcl ~ win/Makefile.msc ~ www/build.wiki
M src/makemake.tcl
+5
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1171,10 +1171,13 @@
11711171
 # Uncomment to enable miniz usage
11721172
 # FOSSIL_ENABLE_MINIZ = 1
11731173
11741174
 # Uncomment to enable SSL support
11751175
 # FOSSIL_ENABLE_SSL = 1
1176
+
1177
+# Uncomment to build SSL libraries
1178
+# FOSSIL_BUILD_SSL = 1
11761179
11771180
 # Uncomment to enable TH1 scripts in embedded documentation files
11781181
 # FOSSIL_ENABLE_TH1_DOCS = 1
11791182
11801183
 # Uncomment to enable TH1 hooks
@@ -1355,11 +1358,13 @@
13551358
 !ifndef FOSSIL_ENABLE_MINIZ
13561359
 APPTARGETS = $(APPTARGETS) zlib
13571360
 !endif
13581361
13591362
 !ifdef FOSSIL_ENABLE_SSL
1363
+!ifdef FOSSIL_BUILD_SSL
13601364
 APPTARGETS = $(APPTARGETS) openssl
1365
+!endif
13611366
 !endif
13621367
13631368
 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
13641369
 cd $(OX)
13651370
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
13661371
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1171,10 +1171,13 @@
1171 # Uncomment to enable miniz usage
1172 # FOSSIL_ENABLE_MINIZ = 1
1173
1174 # Uncomment to enable SSL support
1175 # FOSSIL_ENABLE_SSL = 1
 
 
 
1176
1177 # Uncomment to enable TH1 scripts in embedded documentation files
1178 # FOSSIL_ENABLE_TH1_DOCS = 1
1179
1180 # Uncomment to enable TH1 hooks
@@ -1355,11 +1358,13 @@
1355 !ifndef FOSSIL_ENABLE_MINIZ
1356 APPTARGETS = $(APPTARGETS) zlib
1357 !endif
1358
1359 !ifdef FOSSIL_ENABLE_SSL
 
1360 APPTARGETS = $(APPTARGETS) openssl
 
1361 !endif
1362
1363 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1364 cd $(OX)
1365 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1366
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1171,10 +1171,13 @@
1171 # Uncomment to enable miniz usage
1172 # FOSSIL_ENABLE_MINIZ = 1
1173
1174 # Uncomment to enable SSL support
1175 # FOSSIL_ENABLE_SSL = 1
1176
1177 # Uncomment to build SSL libraries
1178 # FOSSIL_BUILD_SSL = 1
1179
1180 # Uncomment to enable TH1 scripts in embedded documentation files
1181 # FOSSIL_ENABLE_TH1_DOCS = 1
1182
1183 # Uncomment to enable TH1 hooks
@@ -1355,11 +1358,13 @@
1358 !ifndef FOSSIL_ENABLE_MINIZ
1359 APPTARGETS = $(APPTARGETS) zlib
1360 !endif
1361
1362 !ifdef FOSSIL_ENABLE_SSL
1363 !ifdef FOSSIL_BUILD_SSL
1364 APPTARGETS = $(APPTARGETS) openssl
1365 !endif
1366 !endif
1367
1368 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1369 cd $(OX)
1370 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1371
M win/Makefile.msc
+5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -30,10 +30,13 @@
3030
 # Uncomment to enable miniz usage
3131
 # FOSSIL_ENABLE_MINIZ = 1
3232
3333
 # Uncomment to enable SSL support
3434
 # FOSSIL_ENABLE_SSL = 1
35
+
36
+# Uncomment to build SSL libraries
37
+# FOSSIL_BUILD_SSL = 1
3538
3639
 # Uncomment to enable TH1 scripts in embedded documentation files
3740
 # FOSSIL_ENABLE_TH1_DOCS = 1
3841
3942
 # Uncomment to enable TH1 hooks
@@ -430,11 +433,13 @@
430433
 !ifndef FOSSIL_ENABLE_MINIZ
431434
 APPTARGETS = $(APPTARGETS) zlib
432435
 !endif
433436
434437
 !ifdef FOSSIL_ENABLE_SSL
438
+!ifdef FOSSIL_BUILD_SSL
435439
 APPTARGETS = $(APPTARGETS) openssl
440
+!endif
436441
 !endif
437442
438443
 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
439444
 cd $(OX)
440445
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
441446
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -30,10 +30,13 @@
30 # Uncomment to enable miniz usage
31 # FOSSIL_ENABLE_MINIZ = 1
32
33 # Uncomment to enable SSL support
34 # FOSSIL_ENABLE_SSL = 1
 
 
 
35
36 # Uncomment to enable TH1 scripts in embedded documentation files
37 # FOSSIL_ENABLE_TH1_DOCS = 1
38
39 # Uncomment to enable TH1 hooks
@@ -430,11 +433,13 @@
430 !ifndef FOSSIL_ENABLE_MINIZ
431 APPTARGETS = $(APPTARGETS) zlib
432 !endif
433
434 !ifdef FOSSIL_ENABLE_SSL
 
435 APPTARGETS = $(APPTARGETS) openssl
 
436 !endif
437
438 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
439 cd $(OX)
440 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
441
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -30,10 +30,13 @@
30 # Uncomment to enable miniz usage
31 # FOSSIL_ENABLE_MINIZ = 1
32
33 # Uncomment to enable SSL support
34 # FOSSIL_ENABLE_SSL = 1
35
36 # Uncomment to build SSL libraries
37 # FOSSIL_BUILD_SSL = 1
38
39 # Uncomment to enable TH1 scripts in embedded documentation files
40 # FOSSIL_ENABLE_TH1_DOCS = 1
41
42 # Uncomment to enable TH1 hooks
@@ -430,11 +433,13 @@
433 !ifndef FOSSIL_ENABLE_MINIZ
434 APPTARGETS = $(APPTARGETS) zlib
435 !endif
436
437 !ifdef FOSSIL_ENABLE_SSL
438 !ifdef FOSSIL_BUILD_SSL
439 APPTARGETS = $(APPTARGETS) openssl
440 !endif
441 !endif
442
443 $(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
444 cd $(OX)
445 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
446
M www/build.wiki
+2 -2
--- www/build.wiki
+++ www/build.wiki
@@ -126,14 +126,14 @@
126126
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
127127
 "<b>compat/openssl-1.0.1i</b>"), then make sure that some recent
128128
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
129129
 and finally run one of the following commands:
130130
 <blockquote><pre>
131
-nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
131
+nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
132132
 </pre></blockquote>
133133
 <blockquote><pre>
134
-buildmsvc.bat FOSSIL_ENABLE_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
134
+buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135135
 </pre></blockquote>
136136
137137
 <li><p><i>Cygwin</i> → The same as other unix-like systems. It is
138138
 recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139139
 making sure you have the "libsqlite3-devel" , "zlib-devel" and
140140
--- www/build.wiki
+++ www/build.wiki
@@ -126,14 +126,14 @@
126 [/tree?ci=trunk&name=compat | compat] directory (e.g.
127 "<b>compat/openssl-1.0.1i</b>"), then make sure that some recent
128 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
129 and finally run one of the following commands:
130 <blockquote><pre>
131 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
132 </pre></blockquote>
133 <blockquote><pre>
134 buildmsvc.bat FOSSIL_ENABLE_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135 </pre></blockquote>
136
137 <li><p><i>Cygwin</i> → The same as other unix-like systems. It is
138 recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139 making sure you have the "libsqlite3-devel" , "zlib-devel" and
140
--- www/build.wiki
+++ www/build.wiki
@@ -126,14 +126,14 @@
126 [/tree?ci=trunk&name=compat | compat] directory (e.g.
127 "<b>compat/openssl-1.0.1i</b>"), then make sure that some recent
128 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
129 and finally run one of the following commands:
130 <blockquote><pre>
131 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
132 </pre></blockquote>
133 <blockquote><pre>
134 buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135 </pre></blockquote>
136
137 <li><p><i>Cygwin</i> → The same as other unix-like systems. It is
138 recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139 making sure you have the "libsqlite3-devel" , "zlib-devel" and
140

Keyboard Shortcuts

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