Fossil SCM

Merge updates from trunk.

mistachkin 2014-09-30 15:13 UTC inherit-priv-mark-sub merge

Commit eb44ae1f7c1e00c9481312a54f81018c04a48d23

Parent df0e48e0ab0badf…

5 files changed +41 -8 +9 -5 +9 -5 +32 -3 +2 -2

~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki

M src/makemake.tcl

+41 -8

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -486,10 +486,18 @@
486	486	ifndef MINGW_IS_32BIT_ONLY
487	487	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488	488	MINGW_IS_32BIT_ONLY = 1
489	489	endif
490	490	endif
	491	+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
	492	+SSLCONFIG = mingw
	493	+else
	494	+SSLCONFIG = mingw64
	495	+endif
	496	+ifndef FOSSIL_ENABLE_MINIZ
	497	+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
	498	+endif
491	499
492	500	#### The directories where the zlib include and library files are located.
493	501	#
494	502	ZINCDIR = $(SRCDIR)/../compat/zlib
495	503	ZLIBDIR = $(SRCDIR)/../compat/zlib
		@@ -859,15 +867,11 @@
859	867	ifndef FOSSIL_ENABLE_MINIZ
860	868	LIBTARGETS += zlib
861	869	endif
862	870
863	871	openssl: $(LIBTARGETS)
864		-ifndef FOSSIL_ENABLE_MINIZ
865		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
866		-else
867		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
868		-endif
	872	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
869	873	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
870	874
871	875	clean-openssl:
872	876	$(MAKE) -C $(OPENSSLLIBDIR) clean
873	877
		@@ -1141,10 +1145,18 @@
1141	1145
1142	1146	writeln {#
1143	1147	##############################################################################
1144	1148	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1145	1149	##############################################################################
	1150	+#
	1151	+# This Makefile will only function correctly if used from a sub-directory
	1152	+# that is a direct child of the top-level directory for this project.
	1153	+#
	1154	+!if !exist("..\.fossil-settings")
	1155	+!error "Please change the current directory to the one containing this file."
	1156	+!endif
	1157	+
1146	1158	#
1147	1159	# This file is automatically generated. Instead of editing this
1148	1160	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1149	1161	# to regenerate this file.
1150	1162	#
		@@ -1171,10 +1183,13 @@
1171	1183	# Uncomment to enable miniz usage
1172	1184	# FOSSIL_ENABLE_MINIZ = 1
1173	1185
1174	1186	# Uncomment to enable SSL support
1175	1187	# FOSSIL_ENABLE_SSL = 1
	1188	+
	1189	+# Uncomment to build SSL libraries
	1190	+# FOSSIL_BUILD_SSL = 1
1176	1191
1177	1192	# Uncomment to enable TH1 scripts in embedded documentation files
1178	1193	# FOSSIL_ENABLE_TH1_DOCS = 1
1179	1194
1180	1195	# Uncomment to enable TH1 hooks
		@@ -1186,10 +1201,26 @@
1186	1201	!ifdef FOSSIL_ENABLE_SSL
1187	1202	SSLDIR = $(B)\compat\openssl-1.0.1i
1188	1203	SSLINCDIR = $(SSLDIR)\inc32
1189	1204	SSLLIBDIR = $(SSLDIR)\out32
1190	1205	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
	1206	+!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	1207	+!message Using 'x64' platform for OpenSSL...
	1208	+SSLCONFIG = VC-WIN64A no-asm
	1209	+SSLSETUP = ms\do_win64a.bat
	1210	+SSLNMAKE = ms\nt.mak all
	1211	+!elseif "$(PLATFORM)"=="ia64"
	1212	+!message Using 'ia64' platform for OpenSSL...
	1213	+SSLCONFIG = VC-WIN64I no-asm
	1214	+SSLSETUP = ms\do_win64i.bat
	1215	+SSLNMAKE = ms\nt.mak all
	1216	+!else
	1217	+!message Assuming 'x86' platform for OpenSSL...
	1218	+SSLCONFIG = VC-WIN32 no-asm
	1219	+SSLSETUP = ms\do_ms.bat
	1220	+SSLNMAKE = ms\nt.mak all
	1221	+!endif
1191	1222	!endif
1192	1223
1193	1224	!ifdef FOSSIL_ENABLE_TCL
1194	1225	TCLDIR = $(B)\compat\tcl-8.6
1195	1226	TCLSRCDIR = $(TCLDIR)
		@@ -1329,21 +1360,23 @@
1329	1360	openssl:
1330	1361	@echo Building OpenSSL from "$(SSLDIR)"...
1331	1362	!if "$(PERLDIR)" != ""
1332	1363	@set PATH=$(PERLDIR);$(PATH)
1333	1364	!endif
1334		- @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1335		- @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1336		- @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
	1365	+ @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
	1366	+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
	1367	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1337	1368	!endif
1338	1369
1339	1370	!ifndef FOSSIL_ENABLE_MINIZ
1340	1371	APPTARGETS = $(APPTARGETS) zlib
1341	1372	!endif
1342	1373
1343	1374	!ifdef FOSSIL_ENABLE_SSL
	1375	+!ifdef FOSSIL_BUILD_SSL
1344	1376	APPTARGETS = $(APPTARGETS) openssl
	1377	+!endif
1345	1378	!endif
1346	1379
1347	1380	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1348	1381	cd $(OX)
1349	1382	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1350	1383

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -486,10 +486,18 @@
486	ifndef MINGW_IS_32BIT_ONLY
487	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488	MINGW_IS_32BIT_ONLY = 1
489	endif
490	endif








491
492	#### The directories where the zlib include and library files are located.
493	#
494	ZINCDIR = $(SRCDIR)/../compat/zlib
495	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -859,15 +867,11 @@
859	ifndef FOSSIL_ENABLE_MINIZ
860	LIBTARGETS += zlib
861	endif
862
863	openssl: $(LIBTARGETS)
864	ifndef FOSSIL_ENABLE_MINIZ
865	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
866	else
867	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
868	endif
869	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
870
871	clean-openssl:
872	$(MAKE) -C $(OPENSSLLIBDIR) clean
873
	@@ -1141,10 +1145,18 @@
1141
1142	writeln {#
1143	##############################################################################
1144	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1145	##############################################################################








1146	#
1147	# This file is automatically generated. Instead of editing this
1148	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1149	# to regenerate this file.
1150	#
	@@ -1171,10 +1183,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
	@@ -1186,10 +1201,26 @@
1186	!ifdef FOSSIL_ENABLE_SSL
1187	SSLDIR = $(B)\compat\openssl-1.0.1i
1188	SSLINCDIR = $(SSLDIR)\inc32
1189	SSLLIBDIR = $(SSLDIR)\out32
1190	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
















1191	!endif
1192
1193	!ifdef FOSSIL_ENABLE_TCL
1194	TCLDIR = $(B)\compat\tcl-8.6
1195	TCLSRCDIR = $(TCLDIR)
	@@ -1329,21 +1360,23 @@
1329	openssl:
1330	@echo Building OpenSSL from "$(SSLDIR)"...
1331	!if "$(PERLDIR)" != ""
1332	@set PATH=$(PERLDIR);$(PATH)
1333	!endif
1334	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
1335	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1336	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1337	!endif
1338
1339	!ifndef FOSSIL_ENABLE_MINIZ
1340	APPTARGETS = $(APPTARGETS) zlib
1341	!endif
1342
1343	!ifdef FOSSIL_ENABLE_SSL

1344	APPTARGETS = $(APPTARGETS) openssl

1345	!endif
1346
1347	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1348	cd $(OX)
1349	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1350

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -486,10 +486,18 @@
486	ifndef MINGW_IS_32BIT_ONLY
487	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
488	MINGW_IS_32BIT_ONLY = 1
489	endif
490	endif
491	ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
492	SSLCONFIG = mingw
493	else
494	SSLCONFIG = mingw64
495	endif
496	ifndef FOSSIL_ENABLE_MINIZ
497	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
498	endif
499
500	#### The directories where the zlib include and library files are located.
501	#
502	ZINCDIR = $(SRCDIR)/../compat/zlib
503	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -859,15 +867,11 @@
867	ifndef FOSSIL_ENABLE_MINIZ
868	LIBTARGETS += zlib
869	endif
870
871	openssl: $(LIBTARGETS)
872	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)




873	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
874
875	clean-openssl:
876	$(MAKE) -C $(OPENSSLLIBDIR) clean
877
	@@ -1141,10 +1145,18 @@
1145
1146	writeln {#
1147	##############################################################################
1148	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1149	##############################################################################
1150	#
1151	# This Makefile will only function correctly if used from a sub-directory
1152	# that is a direct child of the top-level directory for this project.
1153	#
1154	!if !exist("..\.fossil-settings")
1155	!error "Please change the current directory to the one containing this file."
1156	!endif
1157
1158	#
1159	# This file is automatically generated. Instead of editing this
1160	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
1161	# to regenerate this file.
1162	#
	@@ -1171,10 +1183,13 @@
1183	# Uncomment to enable miniz usage
1184	# FOSSIL_ENABLE_MINIZ = 1
1185
1186	# Uncomment to enable SSL support
1187	# FOSSIL_ENABLE_SSL = 1
1188
1189	# Uncomment to build SSL libraries
1190	# FOSSIL_BUILD_SSL = 1
1191
1192	# Uncomment to enable TH1 scripts in embedded documentation files
1193	# FOSSIL_ENABLE_TH1_DOCS = 1
1194
1195	# Uncomment to enable TH1 hooks
	@@ -1186,10 +1201,26 @@
1201	!ifdef FOSSIL_ENABLE_SSL
1202	SSLDIR = $(B)\compat\openssl-1.0.1i
1203	SSLINCDIR = $(SSLDIR)\inc32
1204	SSLLIBDIR = $(SSLDIR)\out32
1205	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1206	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1207	!message Using 'x64' platform for OpenSSL...
1208	SSLCONFIG = VC-WIN64A no-asm
1209	SSLSETUP = ms\do_win64a.bat
1210	SSLNMAKE = ms\nt.mak all
1211	!elseif "$(PLATFORM)"=="ia64"
1212	!message Using 'ia64' platform for OpenSSL...
1213	SSLCONFIG = VC-WIN64I no-asm
1214	SSLSETUP = ms\do_win64i.bat
1215	SSLNMAKE = ms\nt.mak all
1216	!else
1217	!message Assuming 'x86' platform for OpenSSL...
1218	SSLCONFIG = VC-WIN32 no-asm
1219	SSLSETUP = ms\do_ms.bat
1220	SSLNMAKE = ms\nt.mak all
1221	!endif
1222	!endif
1223
1224	!ifdef FOSSIL_ENABLE_TCL
1225	TCLDIR = $(B)\compat\tcl-8.6
1226	TCLSRCDIR = $(TCLDIR)
	@@ -1329,21 +1360,23 @@
1360	openssl:
1361	@echo Building OpenSSL from "$(SSLDIR)"...
1362	!if "$(PERLDIR)" != ""
1363	@set PATH=$(PERLDIR);$(PATH)
1364	!endif
1365	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1366	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1367	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1368	!endif
1369
1370	!ifndef FOSSIL_ENABLE_MINIZ
1371	APPTARGETS = $(APPTARGETS) zlib
1372	!endif
1373
1374	!ifdef FOSSIL_ENABLE_SSL
1375	!ifdef FOSSIL_BUILD_SSL
1376	APPTARGETS = $(APPTARGETS) openssl
1377	!endif
1378	!endif
1379
1380	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1381	cd $(OX)
1382	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1383

M win/Makefile.mingw

+9 -5

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -94,10 +94,18 @@
94	94	ifndef MINGW_IS_32BIT_ONLY
95	95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	96	MINGW_IS_32BIT_ONLY = 1
97	97	endif
98	98	endif
	99	+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
	100	+SSLCONFIG = mingw
	101	+else
	102	+SSLCONFIG = mingw64
	103	+endif
	104	+ifndef FOSSIL_ENABLE_MINIZ
	105	+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
	106	+endif
99	107
100	108	#### The directories where the zlib include and library files are located.
101	109	#
102	110	ZINCDIR = $(SRCDIR)/../compat/zlib
103	111	ZLIBDIR = $(SRCDIR)/../compat/zlib
		@@ -788,15 +796,11 @@
788	796	ifndef FOSSIL_ENABLE_MINIZ
789	797	LIBTARGETS += zlib
790	798	endif
791	799
792	800	openssl: $(LIBTARGETS)
793		-ifndef FOSSIL_ENABLE_MINIZ
794		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795		-else
796		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797		-endif
	801	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
798	802	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
799	803
800	804	clean-openssl:
801	805	$(MAKE) -C $(OPENSSLLIBDIR) clean
802	806
803	807

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -94,10 +94,18 @@
94	ifndef MINGW_IS_32BIT_ONLY
95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	MINGW_IS_32BIT_ONLY = 1
97	endif
98	endif








99
100	#### The directories where the zlib include and library files are located.
101	#
102	ZINCDIR = $(SRCDIR)/../compat/zlib
103	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -788,15 +796,11 @@
788	ifndef FOSSIL_ENABLE_MINIZ
789	LIBTARGETS += zlib
790	endif
791
792	openssl: $(LIBTARGETS)
793	ifndef FOSSIL_ENABLE_MINIZ
794	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795	else
796	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797	endif
798	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
799
800	clean-openssl:
801	$(MAKE) -C $(OPENSSLLIBDIR) clean
802
803

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -94,10 +94,18 @@
94	ifndef MINGW_IS_32BIT_ONLY
95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	MINGW_IS_32BIT_ONLY = 1
97	endif
98	endif
99	ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100	SSLCONFIG = mingw
101	else
102	SSLCONFIG = mingw64
103	endif
104	ifndef FOSSIL_ENABLE_MINIZ
105	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106	endif
107
108	#### The directories where the zlib include and library files are located.
109	#
110	ZINCDIR = $(SRCDIR)/../compat/zlib
111	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -788,15 +796,11 @@
796	ifndef FOSSIL_ENABLE_MINIZ
797	LIBTARGETS += zlib
798	endif
799
800	openssl: $(LIBTARGETS)
801	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)




802	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
803
804	clean-openssl:
805	$(MAKE) -C $(OPENSSLLIBDIR) clean
806
807

M win/Makefile.mingw.mistachkin

+9 -5

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -94,10 +94,18 @@
94	94	ifndef MINGW_IS_32BIT_ONLY
95	95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	96	MINGW_IS_32BIT_ONLY = 1
97	97	endif
98	98	endif
	99	+ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
	100	+SSLCONFIG = mingw
	101	+else
	102	+SSLCONFIG = mingw64
	103	+endif
	104	+ifndef FOSSIL_ENABLE_MINIZ
	105	+SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
	106	+endif
99	107
100	108	#### The directories where the zlib include and library files are located.
101	109	#
102	110	ZINCDIR = $(SRCDIR)/../compat/zlib
103	111	ZLIBDIR = $(SRCDIR)/../compat/zlib
		@@ -788,15 +796,11 @@
788	796	ifndef FOSSIL_ENABLE_MINIZ
789	797	LIBTARGETS += zlib
790	798	endif
791	799
792	800	openssl: $(LIBTARGETS)
793		-ifndef FOSSIL_ENABLE_MINIZ
794		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795		-else
796		- cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797		-endif
	801	+ cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
798	802	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
799	803
800	804	clean-openssl:
801	805	$(MAKE) -C $(OPENSSLLIBDIR) clean
802	806
803	807

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -94,10 +94,18 @@
94	ifndef MINGW_IS_32BIT_ONLY
95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	MINGW_IS_32BIT_ONLY = 1
97	endif
98	endif








99
100	#### The directories where the zlib include and library files are located.
101	#
102	ZINCDIR = $(SRCDIR)/../compat/zlib
103	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -788,15 +796,11 @@
788	ifndef FOSSIL_ENABLE_MINIZ
789	LIBTARGETS += zlib
790	endif
791
792	openssl: $(LIBTARGETS)
793	ifndef FOSSIL_ENABLE_MINIZ
794	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
795	else
796	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
797	endif
798	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
799
800	clean-openssl:
801	$(MAKE) -C $(OPENSSLLIBDIR) clean
802
803

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -94,10 +94,18 @@
94	ifndef MINGW_IS_32BIT_ONLY
95	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	MINGW_IS_32BIT_ONLY = 1
97	endif
98	endif
99	ifeq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
100	SSLCONFIG = mingw
101	else
102	SSLCONFIG = mingw64
103	endif
104	ifndef FOSSIL_ENABLE_MINIZ
105	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
106	endif
107
108	#### The directories where the zlib include and library files are located.
109	#
110	ZINCDIR = $(SRCDIR)/../compat/zlib
111	ZLIBDIR = $(SRCDIR)/../compat/zlib
	@@ -788,15 +796,11 @@
796	ifndef FOSSIL_ENABLE_MINIZ
797	LIBTARGETS += zlib
798	endif
799
800	openssl: $(LIBTARGETS)
801	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)




802	$(MAKE) -C $(OPENSSLLIBDIR) build_libs
803
804	clean-openssl:
805	$(MAKE) -C $(OPENSSLLIBDIR) clean
806
807

M win/Makefile.msc

+32 -3

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1,9 +1,17 @@
1	1	#
2	2	##############################################################################
3	3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	4	##############################################################################
	5	+#
	6	+# This Makefile will only function correctly if used from a sub-directory
	7	+# that is a direct child of the top-level directory for this project.
	8	+#
	9	+!if !exist("..\.fossil-settings")
	10	+!error "Please change the current directory to the one containing this file."
	11	+!endif
	12	+
5	13	#
6	14	# This file is automatically generated. Instead of editing this
7	15	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
8	16	# to regenerate this file.
9	17	#
		@@ -30,10 +38,13 @@
30	38	# Uncomment to enable miniz usage
31	39	# FOSSIL_ENABLE_MINIZ = 1
32	40
33	41	# Uncomment to enable SSL support
34	42	# FOSSIL_ENABLE_SSL = 1
	43	+
	44	+# Uncomment to build SSL libraries
	45	+# FOSSIL_BUILD_SSL = 1
35	46
36	47	# Uncomment to enable TH1 scripts in embedded documentation files
37	48	# FOSSIL_ENABLE_TH1_DOCS = 1
38	49
39	50	# Uncomment to enable TH1 hooks
		@@ -45,10 +56,26 @@
45	56	!ifdef FOSSIL_ENABLE_SSL
46	57	SSLDIR = $(B)\compat\openssl-1.0.1i
47	58	SSLINCDIR = $(SSLDIR)\inc32
48	59	SSLLIBDIR = $(SSLDIR)\out32
49	60	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
	61	+!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	62	+!message Using 'x64' platform for OpenSSL...
	63	+SSLCONFIG = VC-WIN64A no-asm
	64	+SSLSETUP = ms\do_win64a.bat
	65	+SSLNMAKE = ms\nt.mak all
	66	+!elseif "$(PLATFORM)"=="ia64"
	67	+!message Using 'ia64' platform for OpenSSL...
	68	+SSLCONFIG = VC-WIN64I no-asm
	69	+SSLSETUP = ms\do_win64i.bat
	70	+SSLNMAKE = ms\nt.mak all
	71	+!else
	72	+!message Assuming 'x86' platform for OpenSSL...
	73	+SSLCONFIG = VC-WIN32 no-asm
	74	+SSLSETUP = ms\do_ms.bat
	75	+SSLNMAKE = ms\nt.mak all
	76	+!endif
50	77	!endif
51	78
52	79	!ifdef FOSSIL_ENABLE_TCL
53	80	TCLDIR = $(B)\compat\tcl-8.6
54	81	TCLSRCDIR = $(TCLDIR)
		@@ -404,21 +431,23 @@
404	431	openssl:
405	432	@echo Building OpenSSL from "$(SSLDIR)"...
406	433	!if "$(PERLDIR)" != ""
407	434	@set PATH=$(PERLDIR);$(PATH)
408	435	!endif
409		- @pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
410		- @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
411		- @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
	436	+ @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
	437	+ @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
	438	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
412	439	!endif
413	440
414	441	!ifndef FOSSIL_ENABLE_MINIZ
415	442	APPTARGETS = $(APPTARGETS) zlib
416	443	!endif
417	444
418	445	!ifdef FOSSIL_ENABLE_SSL
	446	+!ifdef FOSSIL_BUILD_SSL
419	447	APPTARGETS = $(APPTARGETS) openssl
	448	+!endif
420	449	!endif
421	450
422	451	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
423	452	cd $(OX)
424	453	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
425	454

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,9 +1,17 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################








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	#
	@@ -30,10 +38,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
	@@ -45,10 +56,26 @@
45	!ifdef FOSSIL_ENABLE_SSL
46	SSLDIR = $(B)\compat\openssl-1.0.1i
47	SSLINCDIR = $(SSLDIR)\inc32
48	SSLLIBDIR = $(SSLDIR)\out32
49	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
















50	!endif
51
52	!ifdef FOSSIL_ENABLE_TCL
53	TCLDIR = $(B)\compat\tcl-8.6
54	TCLSRCDIR = $(TCLDIR)
	@@ -404,21 +431,23 @@
404	openssl:
405	@echo Building OpenSSL from "$(SSLDIR)"...
406	!if "$(PERLDIR)" != ""
407	@set PATH=$(PERLDIR);$(PATH)
408	!endif
409	@pushd "$(SSLDIR)" && $(PERL) Configure VC-WIN32 no-asm && popd
410	@pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
411	@pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
412	!endif
413
414	!ifndef FOSSIL_ENABLE_MINIZ
415	APPTARGETS = $(APPTARGETS) zlib
416	!endif
417
418	!ifdef FOSSIL_ENABLE_SSL

419	APPTARGETS = $(APPTARGETS) openssl

420	!endif
421
422	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
423	cd $(OX)
424	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
425

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,9 +1,17 @@
1	#
2	##############################################################################
3	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4	##############################################################################
5	#
6	# This Makefile will only function correctly if used from a sub-directory
7	# that is a direct child of the top-level directory for this project.
8	#
9	!if !exist("..\.fossil-settings")
10	!error "Please change the current directory to the one containing this file."
11	!endif
12
13	#
14	# This file is automatically generated. Instead of editing this
15	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
16	# to regenerate this file.
17	#
	@@ -30,10 +38,13 @@
38	# Uncomment to enable miniz usage
39	# FOSSIL_ENABLE_MINIZ = 1
40
41	# Uncomment to enable SSL support
42	# FOSSIL_ENABLE_SSL = 1
43
44	# Uncomment to build SSL libraries
45	# FOSSIL_BUILD_SSL = 1
46
47	# Uncomment to enable TH1 scripts in embedded documentation files
48	# FOSSIL_ENABLE_TH1_DOCS = 1
49
50	# Uncomment to enable TH1 hooks
	@@ -45,10 +56,26 @@
56	!ifdef FOSSIL_ENABLE_SSL
57	SSLDIR = $(B)\compat\openssl-1.0.1i
58	SSLINCDIR = $(SSLDIR)\inc32
59	SSLLIBDIR = $(SSLDIR)\out32
60	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
61	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
62	!message Using 'x64' platform for OpenSSL...
63	SSLCONFIG = VC-WIN64A no-asm
64	SSLSETUP = ms\do_win64a.bat
65	SSLNMAKE = ms\nt.mak all
66	!elseif "$(PLATFORM)"=="ia64"
67	!message Using 'ia64' platform for OpenSSL...
68	SSLCONFIG = VC-WIN64I no-asm
69	SSLSETUP = ms\do_win64i.bat
70	SSLNMAKE = ms\nt.mak all
71	!else
72	!message Assuming 'x86' platform for OpenSSL...
73	SSLCONFIG = VC-WIN32 no-asm
74	SSLSETUP = ms\do_ms.bat
75	SSLNMAKE = ms\nt.mak all
76	!endif
77	!endif
78
79	!ifdef FOSSIL_ENABLE_TCL
80	TCLDIR = $(B)\compat\tcl-8.6
81	TCLSRCDIR = $(TCLDIR)
	@@ -404,21 +431,23 @@
431	openssl:
432	@echo Building OpenSSL from "$(SSLDIR)"...
433	!if "$(PERLDIR)" != ""
434	@set PATH=$(PERLDIR);$(PATH)
435	!endif
436	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
437	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
438	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
439	!endif
440
441	!ifndef FOSSIL_ENABLE_MINIZ
442	APPTARGETS = $(APPTARGETS) zlib
443	!endif
444
445	!ifdef FOSSIL_ENABLE_SSL
446	!ifdef FOSSIL_BUILD_SSL
447	APPTARGETS = $(APPTARGETS) openssl
448	!endif
449	!endif
450
451	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
452	cd $(OX)
453	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
454

M www/build.wiki

+2 -2

		--- www/build.wiki
		+++ www/build.wiki
		@@ -126,14 +126,14 @@
126	126	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
127	127	"<b>compat/openssl-1.0.1i</b>"), then make sure that some recent
128	128	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
129	129	and finally run one of the following commands:
130	130	<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
132	132	</pre></blockquote>
133	133	<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
135	135	</pre></blockquote>
136	136
137	137	<li><p><i>Cygwin</i> → The same as other unix-like systems. It is
138	138	recommended to configure using: "<b>configure --disable-internal-sqlite</b>",
139	139	making sure you have the "libsqlite3-devel" , "zlib-devel" and
140	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 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

Fossil SCM

Keyboard Shortcuts