Fossil SCM

Merge updates from trunk and regenerate makefiles.

mistachkin 2012-01-18 12:55 UTC pushScript merge

Commit 04ab3f0c76c5d96851c138a31b748a372f648151

Parent a49e7cb6367e2a7…

12 files changed +10 -4 +10 -4 +153 -37 +5 -2 +6 -2 +6 -2 +105 -11 +105 -11 +18 -9 +18 -9 +6 -2 +6 -2

~ src/main.mk ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc

M src/main.mk

+10 -4

		--- src/main.mk
		+++ src/main.mk
		@@ -1,6 +1,9 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4	7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
6	9	#
		@@ -320,11 +323,11 @@
320	323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
321	324
322	325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
323	326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
324	327
325		-# WARNING. DANGER. Running the testsuite modifies the repository the
	328	+# WARNING. DANGER. Running the test suite modifies the repository the
326	329	# build is done from, i.e. the checkout belongs to. Do not sync/push
327	330	# the repository after running the tests.
328	331	test: $(OBJDIR) $(APPNAME)
329	332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
330	333
		@@ -337,12 +340,15 @@
337	340	# using -lsqlite3.
338	341	SQLITE3_OBJ.1 =
339	342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
340	343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
341	344
342		-TCL_OBJ.1 =
343		-TCL_OBJ.0 = $(OBJDIR)/th_tcl.o
	345	+# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
	346	+# If it is set to 1, then we need to build the Tcl integration code and
	347	+# link to the Tcl library.
	348	+TCL_OBJ.0 =
	349	+TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
344	350	TCL_OBJ. = $(TCL_OBJ.0)
345	351
346	352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
347	353
348	354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
349	355

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	# to regenerate this file.
6	#
	@@ -320,11 +323,11 @@
320	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
321
322	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
323	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
324
325	# WARNING. DANGER. Running the testsuite modifies the repository the
326	# build is done from, i.e. the checkout belongs to. Do not sync/push
327	# the repository after running the tests.
328	test: $(OBJDIR) $(APPNAME)
329	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
330
	@@ -337,12 +340,15 @@
337	# using -lsqlite3.
338	SQLITE3_OBJ.1 =
339	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
340	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
341
342	TCL_OBJ.1 =
343	TCL_OBJ.0 = $(OBJDIR)/th_tcl.o



344	TCL_OBJ. = $(TCL_OBJ.0)
345
346	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
347
348	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
349

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
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	#
	@@ -320,11 +323,11 @@
323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
324
325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
327
328	# WARNING. DANGER. Running the test suite modifies the repository the
329	# build is done from, i.e. the checkout belongs to. Do not sync/push
330	# the repository after running the tests.
331	test: $(OBJDIR) $(APPNAME)
332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
333
	@@ -337,12 +340,15 @@
340	# using -lsqlite3.
341	SQLITE3_OBJ.1 =
342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
344
345	# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
346	# If it is set to 1, then we need to build the Tcl integration code and
347	# link to the Tcl library.
348	TCL_OBJ.0 =
349	TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
350	TCL_OBJ. = $(TCL_OBJ.0)
351
352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
353
354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
355

M src/main.mk

+10 -4

		--- src/main.mk
		+++ src/main.mk
		@@ -1,6 +1,9 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4	7	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
6	9	#
		@@ -320,11 +323,11 @@
320	323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
321	324
322	325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
323	326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
324	327
325		-# WARNING. DANGER. Running the testsuite modifies the repository the
	328	+# WARNING. DANGER. Running the test suite modifies the repository the
326	329	# build is done from, i.e. the checkout belongs to. Do not sync/push
327	330	# the repository after running the tests.
328	331	test: $(OBJDIR) $(APPNAME)
329	332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
330	333
		@@ -337,12 +340,15 @@
337	340	# using -lsqlite3.
338	341	SQLITE3_OBJ.1 =
339	342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
340	343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
341	344
342		-TCL_OBJ.1 =
343		-TCL_OBJ.0 = $(OBJDIR)/th_tcl.o
	345	+# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
	346	+# If it is set to 1, then we need to build the Tcl integration code and
	347	+# link to the Tcl library.
	348	+TCL_OBJ.0 =
	349	+TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
344	350	TCL_OBJ. = $(TCL_OBJ.0)
345	351
346	352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
347	353
348	354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
349	355

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	# to regenerate this file.
6	#
	@@ -320,11 +323,11 @@
320	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
321
322	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
323	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
324
325	# WARNING. DANGER. Running the testsuite modifies the repository the
326	# build is done from, i.e. the checkout belongs to. Do not sync/push
327	# the repository after running the tests.
328	test: $(OBJDIR) $(APPNAME)
329	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
330
	@@ -337,12 +340,15 @@
337	# using -lsqlite3.
338	SQLITE3_OBJ.1 =
339	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
340	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
341
342	TCL_OBJ.1 =
343	TCL_OBJ.0 = $(OBJDIR)/th_tcl.o



344	TCL_OBJ. = $(TCL_OBJ.0)
345
346	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
347
348	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
349

	--- src/main.mk
	+++ src/main.mk
	@@ -1,6 +1,9 @@
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	#
	@@ -320,11 +323,11 @@
323	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
324
325	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
326	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
327
328	# WARNING. DANGER. Running the test suite modifies the repository the
329	# build is done from, i.e. the checkout belongs to. Do not sync/push
330	# the repository after running the tests.
331	test: $(OBJDIR) $(APPNAME)
332	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
333
	@@ -337,12 +340,15 @@
340	# using -lsqlite3.
341	SQLITE3_OBJ.1 =
342	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
343	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
344
345	# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
346	# If it is set to 1, then we need to build the Tcl integration code and
347	# link to the Tcl library.
348	TCL_OBJ.0 =
349	TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
350	TCL_OBJ. = $(TCL_OBJ.0)
351
352	EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) $(OBJDIR)/cson_amalgamation.o
353
354	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
355

M src/makemake.tcl

+153 -37

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -139,11 +139,14 @@
139	139	#
140	140	puts "building main.mk"
141	141	set output_file [open main.mk w]
142	142	fconfigure $output_file -translation binary
143	143
144		-writeln {# DO NOT EDIT
	144	+writeln {#
	145	+##############################################################################
	146	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	147	+##############################################################################
145	148	#
146	149	# This file is automatically generated. Instead of editing this
147	150	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
148	151	# to regenerate this file.
149	152	#
		@@ -190,11 +193,11 @@
190	193	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
191	194
192	195	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
193	196	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
194	197
195		-# WARNING. DANGER. Running the testsuite modifies the repository the
	198	+# WARNING. DANGER. Running the test suite modifies the repository the
196	199	# build is done from, i.e. the checkout belongs to. Do not sync/push
197	200	# the repository after running the tests.
198	201	test: $(OBJDIR) $(APPNAME)
199	202	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
200	203
		@@ -209,12 +212,15 @@
209	212	# using -lsqlite3.
210	213	SQLITE3_OBJ.1 =
211	214	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
212	215	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
213	216
214		-TCL_OBJ.1 =
215		-TCL_OBJ.0 = $(OBJDIR)/th_tcl.o
	217	+# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
	218	+# If it is set to 1, then we need to build the Tcl integration code and
	219	+# link to the Tcl library.
	220	+TCL_OBJ.0 =
	221	+TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
216	222	TCL_OBJ. = $(TCL_OBJ.0)
217	223
218	224	EXTRAOBJ = \
219	225	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
220	226	$(OBJDIR)/shell.o \
		@@ -307,20 +313,27 @@
307	313	set output_file [open ../win/Makefile.mingw w]
308	314	fconfigure $output_file -translation binary
309	315
310	316	writeln {#!/usr/bin/make
311	317	#
312		-# This is a makefile for us on windows using mingw.
	318	+##############################################################################
	319	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	320	+##############################################################################
	321	+#
	322	+# This file is automatically generated. Instead of editing this
	323	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	324	+# to regenerate this file.
	325	+#
	326	+# This is a makefile for us on windows using MinGW.
313	327	#
314	328	#### The toplevel directory of the source tree. Fossil can be built
315	329	# in a directory that is separate from the source tree. Just change
316	330	# the following to point from the build directory to the src/ folder.
317	331	#
318	332	SRCDIR = src
319	333
320	334	#### The directory into which object code files should be written.
321		-#
322	335	#
323	336	OBJDIR = wbld
324	337
325	338	#### C Compiler and options for use in building executables that
326	339	# will run on the platform that is doing the build. This is used
		@@ -329,51 +342,134 @@
329	342	#
330	343	BCC = gcc
331	344
332	345	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
333	346	#
334		-# FOSSIL_ENABLE_SSL=1
335		-
336		-#### The directory in which the zlib compression library is installed.
337		-#
338		-#
339		-ZLIBDIR = /programs/gnuwin32
340		-
341		-#### C Compile and options for use in building executables that
	347	+# FOSSIL_ENABLE_SSL = 1
	348	+
	349	+#### Enable scripting support via Tcl/Tk
	350	+#
	351	+# FOSSIL_ENABLE_TCL = 1
	352	+
	353	+#### Use the Tcl source directory instead of the install directory?
	354	+# This is useful when Tcl has been compiled statically with MinGW.
	355	+#
	356	+FOSSIL_TCL_SOURCE = 1
	357	+
	358	+#### The directories where the zlib include and library files are located.
	359	+# The recommended usage here is to use the Sysinternals junction tool
	360	+# to create a hard link between an "zlib-1.x.y" sub-directory of the
	361	+# Fossil source code directory and the target zlib source directory.
	362	+#
	363	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
	364	+ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
	365	+
	366	+#### The directories where the OpenSSL include and library files are located.
	367	+# The recommended usage here is to use the Sysinternals junction tool
	368	+# to create a hard link between an "openssl-1.x" sub-directory of the
	369	+# Fossil source code directory and the target OpenSSL source directory.
	370	+#
	371	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	372	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
	373	+
	374	+#### Either the directory where the Tcl library is installed or the Tcl
	375	+# source code directory resides (depending on the value of the macro
	376	+# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
	377	+# this directory must have "include" and "lib" sub-directories. If
	378	+# this points to the Tcl source code directory, this directory must
	379	+# have "generic" and "win" sub-directories. The recommended usage
	380	+# here is to use the Sysinternals junction tool to create a hard
	381	+# link between a "tcl-8.x" sub-directory of the Fossil source code
	382	+# directory and the target Tcl directory. This removes the need to
	383	+# hard-code the necessary paths in this Makefile.
	384	+#
	385	+TCLDIR = $(SRCDIR)/../tcl-8.6
	386	+
	387	+#### The Tcl source code directory. This defaults to the same value as
	388	+# TCLDIR macro (above), which may not be correct. This value will
	389	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	390	+#
	391	+TCLSRCDIR = $(TCLDIR)
	392	+
	393	+#### The Tcl include and library directories. These values will only be
	394	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	395	+#
	396	+TCLINCDIR = $(TCLDIR)/include
	397	+TCLLIBDIR = $(TCLDIR)/lib
	398	+
	399	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	400	+#
	401	+LIBTCL = -ltcl86
	402	+
	403	+#### C Compile and options for use in building executables that
342	404	# will run on the target platform. This is usually the same
343	405	# as BCC, unless you are cross-compiling. This C compiler builds
344	406	# the finished binary for fossil. The BCC compiler above is used
345	407	# for building intermediate code-generator tools.
346	408	#
347		-TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
	409	+TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	410	+
	411	+# With HTTPS support
	412	+ifdef FOSSIL_ENABLE_SSL
	413	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	414	+endif
	415	+
	416	+# With Tcl support
	417	+ifdef FOSSIL_ENABLE_TCL
	418	+ifdef FOSSIL_TCL_SOURCE
	419	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	420	+else
	421	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	422	+endif
	423	+endif
348	424
349	425	# With HTTPS support
350	426	ifdef FOSSIL_ENABLE_SSL
351		-TCC += -static -DFOSSIL_ENABLE_SSL=1
	427	+TCC += -DFOSSIL_ENABLE_SSL=1
	428	+endif
	429	+
	430	+# With Tcl support (statically linked)
	431	+ifdef FOSSIL_ENABLE_TCL
	432	+TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
352	433	endif
353	434
354	435	#### Extra arguments for linking the finished binary. Fossil needs
355	436	# to link against the Z-Lib compression library. There are no
356		-# other dependencies. We sometimes add the -static option here
	437	+# other mandatory dependencies. We add the -static option here
357	438	# so that we can build a static executable that will run in a
358	439	# chroot jail.
359	440	#
360		-#LIB = -lz -lws2_32
361		-# OpenSSL:
	441	+LIB = -static
	442	+LIB += -lmingwex -lz
	443	+
	444	+# OpenSSL: Add the necessary libaries required, if enabled.
362	445	ifdef FOSSIL_ENABLE_SSL
363	446	LIB += -lssl -lcrypto -lgdi32
364	447	endif
365		-LIB += -lmingwex -lz -lws2_32
366	448
367		-#### Tcl shell for use in running the fossil testsuite. This is only
368		-# used for testing. If you do not run
	449	+# Tcl: Add the necessary libaries required, if enabled.
	450	+ifdef FOSSIL_ENABLE_TCL
	451	+LIB += $(LIBTCL)
	452	+endif
	453	+
	454	+#### These libraries MUST appear in the same order as they do for Tcl
	455	+# or linking with it will not work (exact reason unknown).
	456	+#
	457	+ifdef FOSSIL_ENABLE_TCL
	458	+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	459	+else
	460	+LIB += -lws2_32
	461	+endif
	462	+
	463	+#### Tcl shell for use in running the fossil test suite. This is only
	464	+# used for testing.
369	465	#
370	466	TCLSH = tclsh
371	467
372		-#### Nullsoft installer makensis location
	468	+#### Nullsoft installer MakeNSIS location
373	469	#
374		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	470	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
375	471
376	472	#### Include a configuration file that can override any one of these settings.
377	473	#
378	474	-include config.w32
379	475
		@@ -427,15 +523,15 @@
427	523	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
428	524
429	525	$(VERSION): $(SRCDIR)/mkversion.c
430	526	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
431	527
432		-# WARNING. DANGER. Running the testsuite modifies the repository the
	528	+# WARNING. DANGER. Running the test suite modifies the repository the
433	529	# build is done from, i.e. the checkout belongs to. Do not sync/push
434	530	# the repository after running the tests.
435		-test: $(APPNAME)
436		- $(TCLSH) test/tester.tcl $(APPNAME)
	531	+test: $(OBJDIR) $(APPNAME)
	532	+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
437	533
438	534	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
439	535	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
440	536
441	537	EXTRAOBJ = \
		@@ -442,25 +538,29 @@
442	538	$(OBJDIR)/sqlite3.o \
443	539	$(OBJDIR)/shell.o \
444	540	$(OBJDIR)/th.o \
445	541	$(OBJDIR)/th_lang.o \
446	542	$(OBJDIR)/cson_amalgamation.o
	543	+
	544	+ifdef FOSSIL_ENABLE_TCL
	545	+EXTRAOBJ += $(OBJDIR)/th_tcl.o
	546	+endif
447	547
448	548	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
449	549	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
450	550
451	551	# This rule prevents make from using its default rules to try build
452	552	# an executable named "manifest" out of the file named "manifest.c"
453	553	#
454		-$(SRCDIR)/../manifest:
	554	+$(SRCDIR)/../manifest:
455	555	# noop
456	556
457		-# Requires msys to be installed in addition to the mingw, for the "rm"
	557	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
458	558	# command. "del" will not work here because it is not a separate command
459	559	# but a MSDOS-shell builtin.
460	560	#
461		-clean:
	561	+clean:
462	562	rm -rf $(OBJDIR) $(APPNAME)
463	563
464	564	setup: $(OBJDIR) $(APPNAME)
465	565	$(MAKENSIS) ./fossil.nsi
466	566
		@@ -498,11 +598,11 @@
498	598	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
499	599
500	600	set opt {}
501	601	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
502	602	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
503		-writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
	603	+writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
504	604
505	605	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
506	606	set opt {-Dmain=sqlite3_shell}
507	607	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
508	608	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
		@@ -511,10 +611,15 @@
511	611	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
512	612
513	613	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
514	614	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
515	615
	616	+writeln {ifdef FOSSIL_ENABLE_TCL
	617	+$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	618	+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
	619	+endif
	620	+}
516	621
517	622	close $output_file
518	623	#
519	624	# End of the main.mk output
520	625	##############################################################################
		@@ -524,15 +629,19 @@
524	629	#
525	630	puts "building ../win/Makefile.dmc"
526	631	set output_file [open ../win/Makefile.dmc w]
527	632	fconfigure $output_file -translation binary
528	633
529		-writeln {# DO NOT EDIT
	634	+writeln {#
	635	+##############################################################################
	636	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	637	+##############################################################################
530	638	#
531	639	# This file is automatically generated. Instead of editing this
532		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	640	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
533	641	# to regenerate this file.
	642	+#
534	643	B = ..
535	644	SRCDIR = $B\src
536	645	OBJDIR = .
537	646	O = .obj
538	647	E = .exe
		@@ -668,15 +777,19 @@
668	777	#
669	778	puts "building ../win/Makefile.msc"
670	779	set output_file [open ../win/Makefile.msc w]
671	780	fconfigure $output_file -translation binary
672	781
673		-writeln {# DO NOT EDIT
	782	+writeln {#
	783	+##############################################################################
	784	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	785	+##############################################################################
674	786	#
675	787	# This file is automatically generated. Instead of editing this
676		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	788	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
677	789	# to regenerate this file.
	790	+#
678	791	B = ..
679	792	SRCDIR = $B\src
680	793	OBJDIR = .
681	794	OX = .
682	795	O = .obj
		@@ -821,14 +934,17 @@
821	934	#
822	935	puts "building ../win/Makefile.PellesCGMake"
823	936	set output_file [open ../win/Makefile.PellesCGMake w]
824	937	fconfigure $output_file -translation binary
825	938
826		-writeln {# DO NOT EDIT
	939	+writeln {#
	940	+##############################################################################
	941	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	942	+##############################################################################
827	943	#
828	944	# This file is automatically generated. Instead of editing this
829		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	945	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
830	946	# to regenerate this file.
831	947	#
832	948	# HowTo
833	949	# -----
834	950	#
835	951

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -139,11 +139,14 @@
139	#
140	puts "building main.mk"
141	set output_file [open main.mk w]
142	fconfigure $output_file -translation binary
143
144	writeln {# DO NOT EDIT



145	#
146	# This file is automatically generated. Instead of editing this
147	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
148	# to regenerate this file.
149	#
	@@ -190,11 +193,11 @@
190	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
191
192	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
193	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
194
195	# WARNING. DANGER. Running the testsuite modifies the repository the
196	# build is done from, i.e. the checkout belongs to. Do not sync/push
197	# the repository after running the tests.
198	test: $(OBJDIR) $(APPNAME)
199	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
200
	@@ -209,12 +212,15 @@
209	# using -lsqlite3.
210	SQLITE3_OBJ.1 =
211	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
212	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
213
214	TCL_OBJ.1 =
215	TCL_OBJ.0 = $(OBJDIR)/th_tcl.o



216	TCL_OBJ. = $(TCL_OBJ.0)
217
218	EXTRAOBJ = \
219	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
220	$(OBJDIR)/shell.o \
	@@ -307,20 +313,27 @@
307	set output_file [open ../win/Makefile.mingw w]
308	fconfigure $output_file -translation binary
309
310	writeln {#!/usr/bin/make
311	#
312	# This is a makefile for us on windows using mingw.








313	#
314	#### The toplevel directory of the source tree. Fossil can be built
315	# in a directory that is separate from the source tree. Just change
316	# the following to point from the build directory to the src/ folder.
317	#
318	SRCDIR = src
319
320	#### The directory into which object code files should be written.
321	#
322	#
323	OBJDIR = wbld
324
325	#### C Compiler and options for use in building executables that
326	# will run on the platform that is doing the build. This is used
	@@ -329,51 +342,134 @@
329	#
330	BCC = gcc
331
332	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
333	#
334	# FOSSIL_ENABLE_SSL=1
335
336	#### The directory in which the zlib compression library is installed.
337	#
338	#
339	ZLIBDIR = /programs/gnuwin32
340
341	#### C Compile and options for use in building executables that

















































342	# will run on the target platform. This is usually the same
343	# as BCC, unless you are cross-compiling. This C compiler builds
344	# the finished binary for fossil. The BCC compiler above is used
345	# for building intermediate code-generator tools.
346	#
347	TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include














348
349	# With HTTPS support
350	ifdef FOSSIL_ENABLE_SSL
351	TCC += -static -DFOSSIL_ENABLE_SSL=1





352	endif
353
354	#### Extra arguments for linking the finished binary. Fossil needs
355	# to link against the Z-Lib compression library. There are no
356	# other dependencies. We sometimes add the -static option here
357	# so that we can build a static executable that will run in a
358	# chroot jail.
359	#
360	#LIB = -lz -lws2_32
361	# OpenSSL:


362	ifdef FOSSIL_ENABLE_SSL
363	LIB += -lssl -lcrypto -lgdi32
364	endif
365	LIB += -lmingwex -lz -lws2_32
366
367	#### Tcl shell for use in running the fossil testsuite. This is only
368	# used for testing. If you do not run














369	#
370	TCLSH = tclsh
371
372	#### Nullsoft installer makensis location
373	#
374	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
375
376	#### Include a configuration file that can override any one of these settings.
377	#
378	-include config.w32
379
	@@ -427,15 +523,15 @@
427	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
428
429	$(VERSION): $(SRCDIR)/mkversion.c
430	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
431
432	# WARNING. DANGER. Running the testsuite modifies the repository the
433	# build is done from, i.e. the checkout belongs to. Do not sync/push
434	# the repository after running the tests.
435	test: $(APPNAME)
436	$(TCLSH) test/tester.tcl $(APPNAME)
437
438	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
439	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
440
441	EXTRAOBJ = \
	@@ -442,25 +538,29 @@
442	$(OBJDIR)/sqlite3.o \
443	$(OBJDIR)/shell.o \
444	$(OBJDIR)/th.o \
445	$(OBJDIR)/th_lang.o \
446	$(OBJDIR)/cson_amalgamation.o




447
448	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
449	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
450
451	# This rule prevents make from using its default rules to try build
452	# an executable named "manifest" out of the file named "manifest.c"
453	#
454	$(SRCDIR)/../manifest:
455	# noop
456
457	# Requires msys to be installed in addition to the mingw, for the "rm"
458	# command. "del" will not work here because it is not a separate command
459	# but a MSDOS-shell builtin.
460	#
461	clean:
462	rm -rf $(OBJDIR) $(APPNAME)
463
464	setup: $(OBJDIR) $(APPNAME)
465	$(MAKENSIS) ./fossil.nsi
466
	@@ -498,11 +598,11 @@
498	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
499
500	set opt {}
501	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
502	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
503	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
504
505	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
506	set opt {-Dmain=sqlite3_shell}
507	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
508	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	@@ -511,10 +611,15 @@
511	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
512
513	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
514	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
515





516
517	close $output_file
518	#
519	# End of the main.mk output
520	##############################################################################
	@@ -524,15 +629,19 @@
524	#
525	puts "building ../win/Makefile.dmc"
526	set output_file [open ../win/Makefile.dmc w]
527	fconfigure $output_file -translation binary
528
529	writeln {# DO NOT EDIT



530	#
531	# This file is automatically generated. Instead of editing this
532	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
533	# to regenerate this file.

534	B = ..
535	SRCDIR = $B\src
536	OBJDIR = .
537	O = .obj
538	E = .exe
	@@ -668,15 +777,19 @@
668	#
669	puts "building ../win/Makefile.msc"
670	set output_file [open ../win/Makefile.msc w]
671	fconfigure $output_file -translation binary
672
673	writeln {# DO NOT EDIT



674	#
675	# This file is automatically generated. Instead of editing this
676	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
677	# to regenerate this file.

678	B = ..
679	SRCDIR = $B\src
680	OBJDIR = .
681	OX = .
682	O = .obj
	@@ -821,14 +934,17 @@
821	#
822	puts "building ../win/Makefile.PellesCGMake"
823	set output_file [open ../win/Makefile.PellesCGMake w]
824	fconfigure $output_file -translation binary
825
826	writeln {# DO NOT EDIT



827	#
828	# This file is automatically generated. Instead of editing this
829	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
830	# to regenerate this file.
831	#
832	# HowTo
833	# -----
834	#
835

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -139,11 +139,14 @@
139	#
140	puts "building main.mk"
141	set output_file [open main.mk w]
142	fconfigure $output_file -translation binary
143
144	writeln {#
145	##############################################################################
146	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
147	##############################################################################
148	#
149	# This file is automatically generated. Instead of editing this
150	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
151	# to regenerate this file.
152	#
	@@ -190,11 +193,11 @@
193	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
194
195	$(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c
196	$(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
197
198	# WARNING. DANGER. Running the test suite modifies the repository the
199	# build is done from, i.e. the checkout belongs to. Do not sync/push
200	# the repository after running the tests.
201	test: $(OBJDIR) $(APPNAME)
202	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
203
	@@ -209,12 +212,15 @@
212	# using -lsqlite3.
213	SQLITE3_OBJ.1 =
214	SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
215	SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
216
217	# The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1.
218	# If it is set to 1, then we need to build the Tcl integration code and
219	# link to the Tcl library.
220	TCL_OBJ.0 =
221	TCL_OBJ.1 = $(OBJDIR)/th_tcl.o
222	TCL_OBJ. = $(TCL_OBJ.0)
223
224	EXTRAOBJ = \
225	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
226	$(OBJDIR)/shell.o \
	@@ -307,20 +313,27 @@
313	set output_file [open ../win/Makefile.mingw w]
314	fconfigure $output_file -translation binary
315
316	writeln {#!/usr/bin/make
317	#
318	##############################################################################
319	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
320	##############################################################################
321	#
322	# This file is automatically generated. Instead of editing this
323	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
324	# to regenerate this file.
325	#
326	# This is a makefile for us on windows using MinGW.
327	#
328	#### The toplevel directory of the source tree. Fossil can be built
329	# in a directory that is separate from the source tree. Just change
330	# the following to point from the build directory to the src/ folder.
331	#
332	SRCDIR = src
333
334	#### The directory into which object code files should be written.

335	#
336	OBJDIR = wbld
337
338	#### C Compiler and options for use in building executables that
339	# will run on the platform that is doing the build. This is used
	@@ -329,51 +342,134 @@
342	#
343	BCC = gcc
344
345	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
346	#
347	# FOSSIL_ENABLE_SSL = 1
348
349	#### Enable scripting support via Tcl/Tk
350	#
351	# FOSSIL_ENABLE_TCL = 1
352
353	#### Use the Tcl source directory instead of the install directory?
354	# This is useful when Tcl has been compiled statically with MinGW.
355	#
356	FOSSIL_TCL_SOURCE = 1
357
358	#### The directories where the zlib include and library files are located.
359	# The recommended usage here is to use the Sysinternals junction tool
360	# to create a hard link between an "zlib-1.x.y" sub-directory of the
361	# Fossil source code directory and the target zlib source directory.
362	#
363	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
364	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
365
366	#### The directories where the OpenSSL include and library files are located.
367	# The recommended usage here is to use the Sysinternals junction tool
368	# to create a hard link between an "openssl-1.x" sub-directory of the
369	# Fossil source code directory and the target OpenSSL source directory.
370	#
371	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
372	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
373
374	#### Either the directory where the Tcl library is installed or the Tcl
375	# source code directory resides (depending on the value of the macro
376	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
377	# this directory must have "include" and "lib" sub-directories. If
378	# this points to the Tcl source code directory, this directory must
379	# have "generic" and "win" sub-directories. The recommended usage
380	# here is to use the Sysinternals junction tool to create a hard
381	# link between a "tcl-8.x" sub-directory of the Fossil source code
382	# directory and the target Tcl directory. This removes the need to
383	# hard-code the necessary paths in this Makefile.
384	#
385	TCLDIR = $(SRCDIR)/../tcl-8.6
386
387	#### The Tcl source code directory. This defaults to the same value as
388	# TCLDIR macro (above), which may not be correct. This value will
389	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
390	#
391	TCLSRCDIR = $(TCLDIR)
392
393	#### The Tcl include and library directories. These values will only be
394	# used if the FOSSIL_TCL_SOURCE macro is not defined.
395	#
396	TCLINCDIR = $(TCLDIR)/include
397	TCLLIBDIR = $(TCLDIR)/lib
398
399	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
400	#
401	LIBTCL = -ltcl86
402
403	#### C Compile and options for use in building executables that
404	# will run on the target platform. This is usually the same
405	# as BCC, unless you are cross-compiling. This C compiler builds
406	# the finished binary for fossil. The BCC compiler above is used
407	# for building intermediate code-generator tools.
408	#
409	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
410
411	# With HTTPS support
412	ifdef FOSSIL_ENABLE_SSL
413	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
414	endif
415
416	# With Tcl support
417	ifdef FOSSIL_ENABLE_TCL
418	ifdef FOSSIL_TCL_SOURCE
419	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
420	else
421	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
422	endif
423	endif
424
425	# With HTTPS support
426	ifdef FOSSIL_ENABLE_SSL
427	TCC += -DFOSSIL_ENABLE_SSL=1
428	endif
429
430	# With Tcl support (statically linked)
431	ifdef FOSSIL_ENABLE_TCL
432	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
433	endif
434
435	#### Extra arguments for linking the finished binary. Fossil needs
436	# to link against the Z-Lib compression library. There are no
437	# other mandatory dependencies. We add the -static option here
438	# so that we can build a static executable that will run in a
439	# chroot jail.
440	#
441	LIB = -static
442	LIB += -lmingwex -lz
443
444	# OpenSSL: Add the necessary libaries required, if enabled.
445	ifdef FOSSIL_ENABLE_SSL
446	LIB += -lssl -lcrypto -lgdi32
447	endif

448
449	# Tcl: Add the necessary libaries required, if enabled.
450	ifdef FOSSIL_ENABLE_TCL
451	LIB += $(LIBTCL)
452	endif
453
454	#### These libraries MUST appear in the same order as they do for Tcl
455	# or linking with it will not work (exact reason unknown).
456	#
457	ifdef FOSSIL_ENABLE_TCL
458	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
459	else
460	LIB += -lws2_32
461	endif
462
463	#### Tcl shell for use in running the fossil test suite. This is only
464	# used for testing.
465	#
466	TCLSH = tclsh
467
468	#### Nullsoft installer MakeNSIS location
469	#
470	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
471
472	#### Include a configuration file that can override any one of these settings.
473	#
474	-include config.w32
475
	@@ -427,15 +523,15 @@
523	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
524
525	$(VERSION): $(SRCDIR)/mkversion.c
526	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
527
528	# WARNING. DANGER. Running the test suite modifies the repository the
529	# build is done from, i.e. the checkout belongs to. Do not sync/push
530	# the repository after running the tests.
531	test: $(OBJDIR) $(APPNAME)
532	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
533
534	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
535	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
536
537	EXTRAOBJ = \
	@@ -442,25 +538,29 @@
538	$(OBJDIR)/sqlite3.o \
539	$(OBJDIR)/shell.o \
540	$(OBJDIR)/th.o \
541	$(OBJDIR)/th_lang.o \
542	$(OBJDIR)/cson_amalgamation.o
543
544	ifdef FOSSIL_ENABLE_TCL
545	EXTRAOBJ += $(OBJDIR)/th_tcl.o
546	endif
547
548	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
549	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
550
551	# This rule prevents make from using its default rules to try build
552	# an executable named "manifest" out of the file named "manifest.c"
553	#
554	$(SRCDIR)/../manifest:
555	# noop
556
557	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
558	# command. "del" will not work here because it is not a separate command
559	# but a MSDOS-shell builtin.
560	#
561	clean:
562	rm -rf $(OBJDIR) $(APPNAME)
563
564	setup: $(OBJDIR) $(APPNAME)
565	$(MAKENSIS) ./fossil.nsi
566
	@@ -498,11 +598,11 @@
598	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
599
600	set opt {}
601	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
602	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
603	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
604
605	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
606	set opt {-Dmain=sqlite3_shell}
607	append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
608	writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n"
	@@ -511,10 +611,15 @@
611	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n"
612
613	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
614	writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
615
616	writeln {ifdef FOSSIL_ENABLE_TCL
617	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
618	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
619	endif
620	}
621
622	close $output_file
623	#
624	# End of the main.mk output
625	##############################################################################
	@@ -524,15 +629,19 @@
629	#
630	puts "building ../win/Makefile.dmc"
631	set output_file [open ../win/Makefile.dmc w]
632	fconfigure $output_file -translation binary
633
634	writeln {#
635	##############################################################################
636	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
637	##############################################################################
638	#
639	# This file is automatically generated. Instead of editing this
640	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
641	# to regenerate this file.
642	#
643	B = ..
644	SRCDIR = $B\src
645	OBJDIR = .
646	O = .obj
647	E = .exe
	@@ -668,15 +777,19 @@
777	#
778	puts "building ../win/Makefile.msc"
779	set output_file [open ../win/Makefile.msc w]
780	fconfigure $output_file -translation binary
781
782	writeln {#
783	##############################################################################
784	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
785	##############################################################################
786	#
787	# This file is automatically generated. Instead of editing this
788	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
789	# to regenerate this file.
790	#
791	B = ..
792	SRCDIR = $B\src
793	OBJDIR = .
794	OX = .
795	O = .obj
	@@ -821,14 +934,17 @@
934	#
935	puts "building ../win/Makefile.PellesCGMake"
936	set output_file [open ../win/Makefile.PellesCGMake w]
937	fconfigure $output_file -translation binary
938
939	writeln {#
940	##############################################################################
941	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
942	##############################################################################
943	#
944	# This file is automatically generated. Instead of editing this
945	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
946	# to regenerate this file.
947	#
948	# HowTo
949	# -----
950	#
951

M win/Makefile.PellesCGMake

+5 -2

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -1,9 +1,12 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
6	9	#
7	10	# HowTo
8	11	# -----
9	12	#
10	13

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -1,9 +1,12 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.
6	#
7	# HowTo
8	# -----
9	#
10

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -1,9 +1,12 @@
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	#
10	# HowTo
11	# -----
12	#
13

M win/Makefile.dmc

+6 -2

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	O = .obj
10	14	E = .exe
11	15

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	O = .obj
10	E = .exe
11

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
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	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	O = .obj
14	E = .exe
15

M win/Makefile.dmc

+6 -2

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	O = .obj
10	14	E = .exe
11	15

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	O = .obj
10	E = .exe
11

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -1,10 +1,14 @@
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	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	O = .obj
14	E = .exe
15

M win/Makefile.mingw

+105 -11

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1,8 +1,16 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
		@@ -20,28 +28,96 @@
20	28	BCC = gcc
21	29
22	30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	31	#
24	32	# FOSSIL_ENABLE_SSL = 1
	33	+
	34	+#### Enable scripting support via Tcl/Tk
	35	+#
	36	+# FOSSIL_ENABLE_TCL = 1
	37	+
	38	+#### Use the Tcl source directory instead of the install directory?
	39	+# This is useful when Tcl has been compiled statically with MinGW.
	40	+#
	41	+FOSSIL_TCL_SOURCE = 1
25	42
26	43	#### The directories where the zlib include and library files are located.
	44	+# The recommended usage here is to use the Sysinternals junction tool
	45	+# to create a hard link between an "zlib-1.x.y" sub-directory of the
	46	+# Fossil source code directory and the target zlib source directory.
	47	+#
	48	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
	49	+ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
	50	+
	51	+#### The directories where the OpenSSL include and library files are located.
	52	+# The recommended usage here is to use the Sysinternals junction tool
	53	+# to create a hard link between an "openssl-1.x" sub-directory of the
	54	+# Fossil source code directory and the target OpenSSL source directory.
	55	+#
	56	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	57	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
	58	+
	59	+#### Either the directory where the Tcl library is installed or the Tcl
	60	+# source code directory resides (depending on the value of the macro
	61	+# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
	62	+# this directory must have "include" and "lib" sub-directories. If
	63	+# this points to the Tcl source code directory, this directory must
	64	+# have "generic" and "win" sub-directories. The recommended usage
	65	+# here is to use the Sysinternals junction tool to create a hard
	66	+# link between a "tcl-8.x" sub-directory of the Fossil source code
	67	+# directory and the target Tcl directory. This removes the need to
	68	+# hard-code the necessary paths in this Makefile.
	69	+#
	70	+TCLDIR = $(SRCDIR)/../tcl-8.6
	71	+
	72	+#### The Tcl source code directory. This defaults to the same value as
	73	+# TCLDIR macro (above), which may not be correct. This value will
	74	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	75	+#
	76	+TCLSRCDIR = $(TCLDIR)
	77	+
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	80	+#
	81	+TCLINCDIR = $(TCLDIR)/include
	82	+TCLLIBDIR = $(TCLDIR)/lib
	83	+
	84	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
27	85	#
28		-ZINCDIR = /programs/gnuwin32/include
29		-ZLIBDIR = /programs/gnuwin32/lib
	86	+LIBTCL = -ltcl86
30	87
31	88	#### C Compile and options for use in building executables that
32	89	# will run on the target platform. This is usually the same
33	90	# as BCC, unless you are cross-compiling. This C compiler builds
34	91	# the finished binary for fossil. The BCC compiler above is used
35	92	# for building intermediate code-generator tools.
36	93	#
37	94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	95	+
	96	+# With HTTPS support
	97	+ifdef FOSSIL_ENABLE_SSL
	98	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	99	+endif
	100	+
	101	+# With Tcl support
	102	+ifdef FOSSIL_ENABLE_TCL
	103	+ifdef FOSSIL_TCL_SOURCE
	104	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	105	+else
	106	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	107	+endif
	108	+endif
38	109
39	110	# With HTTPS support
40	111	ifdef FOSSIL_ENABLE_SSL
41	112	TCC += -DFOSSIL_ENABLE_SSL=1
42	113	endif
	114	+
	115	+# With Tcl support (statically linked)
	116	+ifdef FOSSIL_ENABLE_TCL
	117	+TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
	118	+endif
43	119
44	120	#### Extra arguments for linking the finished binary. Fossil needs
45	121	# to link against the Z-Lib compression library. There are no
46	122	# other mandatory dependencies. We add the -static option here
47	123	# so that we can build a static executable that will run in a
		@@ -48,28 +124,37 @@
48	124	# chroot jail.
49	125	#
50	126	LIB = -static
51	127	LIB += -lmingwex -lz
52	128
53		-# OpenSSL: Add the necessary libaries required.
	129	+# OpenSSL: Add the necessary libaries required, if enabled.
54	130	ifdef FOSSIL_ENABLE_SSL
55	131	LIB += -lssl -lcrypto -lgdi32
56	132	endif
	133	+
	134	+# Tcl: Add the necessary libaries required, if enabled.
	135	+ifdef FOSSIL_ENABLE_TCL
	136	+LIB += $(LIBTCL)
	137	+endif
57	138
58	139	#### These libraries MUST appear in the same order as they do for Tcl
59	140	# or linking with it will not work (exact reason unknown).
60	141	#
	142	+ifdef FOSSIL_ENABLE_TCL
	143	+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	144	+else
61	145	LIB += -lws2_32
	146	+endif
62	147
63		-#### Tcl shell for use in running the fossil testsuite. This is only
64		-# used for testing. If you do not run
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
65	150	#
66	151	TCLSH = tclsh
67	152
68		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
69	154	#
70		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
71	156
72	157	#### Include a configuration file that can override any one of these settings.
73	158	#
74	159	-include config.w32
75	160
		@@ -395,20 +480,24 @@
395	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
396	481
397	482	$(VERSION): $(SRCDIR)/mkversion.c
398	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399	484
400		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
401	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
402	487	# the repository after running the tests.
403	488	test: $(OBJDIR) $(APPNAME)
404	489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405	490
406	491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407	492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408	493
409	494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
	495	+
	496	+ifdef FOSSIL_ENABLE_TCL
	497	+EXTRAOBJ += $(OBJDIR)/th_tcl.o
	498	+endif
410	499
411	500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
412	501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413	502
414	503	# This rule prevents make from using its default rules to try build
		@@ -415,11 +504,11 @@
415	504	# an executable named "manifest" out of the file named "manifest.c"
416	505	#
417	506	$(SRCDIR)/../manifest:
418	507	# noop
419	508
420		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
421	510	# command. "del" will not work here because it is not a separate command
422	511	# but a MSDOS-shell builtin.
423	512	#
424	513	clean:
425	514	rm -rf $(OBJDIR) $(APPNAME)
		@@ -1098,16 +1187,21 @@
1098	1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099	1188
1100	1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101	1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102	1191
1103		-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
	1192	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1104	1193
1105	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107	1196
1108	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1109	1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110	1199
1111	1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112	1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
	1202	+
	1203	+ifdef FOSSIL_ENABLE_TCL
	1204	+$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	1205	+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
	1206	+endif
1113	1207
1114	1208

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
	@@ -20,28 +28,96 @@
20	BCC = gcc
21
22	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	#
24	# FOSSIL_ENABLE_SSL = 1









25
26	#### The directories where the zlib include and library files are located.









































27	#
28	ZINCDIR = /programs/gnuwin32/include
29	ZLIBDIR = /programs/gnuwin32/lib
30
31	#### C Compile and options for use in building executables that
32	# will run on the target platform. This is usually the same
33	# as BCC, unless you are cross-compiling. This C compiler builds
34	# the finished binary for fossil. The BCC compiler above is used
35	# for building intermediate code-generator tools.
36	#
37	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)














38
39	# With HTTPS support
40	ifdef FOSSIL_ENABLE_SSL
41	TCC += -DFOSSIL_ENABLE_SSL=1
42	endif





43
44	#### Extra arguments for linking the finished binary. Fossil needs
45	# to link against the Z-Lib compression library. There are no
46	# other mandatory dependencies. We add the -static option here
47	# so that we can build a static executable that will run in a
	@@ -48,28 +124,37 @@
48	# chroot jail.
49	#
50	LIB = -static
51	LIB += -lmingwex -lz
52
53	# OpenSSL: Add the necessary libaries required.
54	ifdef FOSSIL_ENABLE_SSL
55	LIB += -lssl -lcrypto -lgdi32
56	endif





57
58	#### These libraries MUST appear in the same order as they do for Tcl
59	# or linking with it will not work (exact reason unknown).
60	#



61	LIB += -lws2_32

62
63	#### Tcl shell for use in running the fossil testsuite. This is only
64	# used for testing. If you do not run
65	#
66	TCLSH = tclsh
67
68	#### Nullsoft installer makensis location
69	#
70	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
71
72	#### Include a configuration file that can override any one of these settings.
73	#
74	-include config.w32
75
	@@ -395,20 +480,24 @@
395	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
396
397	$(VERSION): $(SRCDIR)/mkversion.c
398	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399
400	# WARNING. DANGER. Running the testsuite modifies the repository the
401	# build is done from, i.e. the checkout belongs to. Do not sync/push
402	# the repository after running the tests.
403	test: $(OBJDIR) $(APPNAME)
404	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405
406	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408
409	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o




410
411	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
412	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413
414	# This rule prevents make from using its default rules to try build
	@@ -415,11 +504,11 @@
415	# an executable named "manifest" out of the file named "manifest.c"
416	#
417	$(SRCDIR)/../manifest:
418	# noop
419
420	# Requires msys to be installed in addition to the mingw, for the "rm"
421	# command. "del" will not work here because it is not a separate command
422	# but a MSDOS-shell builtin.
423	#
424	clean:
425	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1098,16 +1187,21 @@
1098	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099
1100	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102
1103	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
1105	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107
1108	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1109	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110
1111	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o





1113
1114

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
	@@ -20,28 +28,96 @@
28	BCC = gcc
29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	# FOSSIL_ENABLE_SSL = 1
33
34	#### Enable scripting support via Tcl/Tk
35	#
36	# FOSSIL_ENABLE_TCL = 1
37
38	#### Use the Tcl source directory instead of the install directory?
39	# This is useful when Tcl has been compiled statically with MinGW.
40	#
41	FOSSIL_TCL_SOURCE = 1
42
43	#### The directories where the zlib include and library files are located.
44	# The recommended usage here is to use the Sysinternals junction tool
45	# to create a hard link between an "zlib-1.x.y" sub-directory of the
46	# Fossil source code directory and the target zlib source directory.
47	#
48	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51	#### The directories where the OpenSSL include and library files are located.
52	# The recommended usage here is to use the Sysinternals junction tool
53	# to create a hard link between an "openssl-1.x" sub-directory of the
54	# Fossil source code directory and the target OpenSSL source directory.
55	#
56	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59	#### Either the directory where the Tcl library is installed or the Tcl
60	# source code directory resides (depending on the value of the macro
61	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62	# this directory must have "include" and "lib" sub-directories. If
63	# this points to the Tcl source code directory, this directory must
64	# have "generic" and "win" sub-directories. The recommended usage
65	# here is to use the Sysinternals junction tool to create a hard
66	# link between a "tcl-8.x" sub-directory of the Fossil source code
67	# directory and the target Tcl directory. This removes the need to
68	# hard-code the necessary paths in this Makefile.
69	#
70	TCLDIR = $(SRCDIR)/../tcl-8.6
71
72	#### The Tcl source code directory. This defaults to the same value as
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
85	#
86	LIBTCL = -ltcl86

87
88	#### C Compile and options for use in building executables that
89	# will run on the target platform. This is usually the same
90	# as BCC, unless you are cross-compiling. This C compiler builds
91	# the finished binary for fossil. The BCC compiler above is used
92	# for building intermediate code-generator tools.
93	#
94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96	# With HTTPS support
97	ifdef FOSSIL_ENABLE_SSL
98	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99	endif
100
101	# With Tcl support
102	ifdef FOSSIL_ENABLE_TCL
103	ifdef FOSSIL_TCL_SOURCE
104	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
105	else
106	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
107	endif
108	endif
109
110	# With HTTPS support
111	ifdef FOSSIL_ENABLE_SSL
112	TCC += -DFOSSIL_ENABLE_SSL=1
113	endif
114
115	# With Tcl support (statically linked)
116	ifdef FOSSIL_ENABLE_TCL
117	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
118	endif
119
120	#### Extra arguments for linking the finished binary. Fossil needs
121	# to link against the Z-Lib compression library. There are no
122	# other mandatory dependencies. We add the -static option here
123	# so that we can build a static executable that will run in a
	@@ -48,28 +124,37 @@
124	# chroot jail.
125	#
126	LIB = -static
127	LIB += -lmingwex -lz
128
129	# OpenSSL: Add the necessary libaries required, if enabled.
130	ifdef FOSSIL_ENABLE_SSL
131	LIB += -lssl -lcrypto -lgdi32
132	endif
133
134	# Tcl: Add the necessary libaries required, if enabled.
135	ifdef FOSSIL_ENABLE_TCL
136	LIB += $(LIBTCL)
137	endif
138
139	#### These libraries MUST appear in the same order as they do for Tcl
140	# or linking with it will not work (exact reason unknown).
141	#
142	ifdef FOSSIL_ENABLE_TCL
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -395,20 +480,24 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
493
494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
495
496	ifdef FOSSIL_ENABLE_TCL
497	EXTRAOBJ += $(OBJDIR)/th_tcl.o
498	endif
499
500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
502
503	# This rule prevents make from using its default rules to try build
	@@ -415,11 +504,11 @@
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1098,16 +1187,21 @@
1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1199
1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1202
1203	ifdef FOSSIL_ENABLE_TCL
1204	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1205	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1206	endif
1207
1208

M win/Makefile.mingw

+105 -11

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1,8 +1,16 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
		@@ -20,28 +28,96 @@
20	28	BCC = gcc
21	29
22	30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	31	#
24	32	# FOSSIL_ENABLE_SSL = 1
	33	+
	34	+#### Enable scripting support via Tcl/Tk
	35	+#
	36	+# FOSSIL_ENABLE_TCL = 1
	37	+
	38	+#### Use the Tcl source directory instead of the install directory?
	39	+# This is useful when Tcl has been compiled statically with MinGW.
	40	+#
	41	+FOSSIL_TCL_SOURCE = 1
25	42
26	43	#### The directories where the zlib include and library files are located.
	44	+# The recommended usage here is to use the Sysinternals junction tool
	45	+# to create a hard link between an "zlib-1.x.y" sub-directory of the
	46	+# Fossil source code directory and the target zlib source directory.
	47	+#
	48	+ZINCDIR = $(SRCDIR)/../zlib-1.2.5
	49	+ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
	50	+
	51	+#### The directories where the OpenSSL include and library files are located.
	52	+# The recommended usage here is to use the Sysinternals junction tool
	53	+# to create a hard link between an "openssl-1.x" sub-directory of the
	54	+# Fossil source code directory and the target OpenSSL source directory.
	55	+#
	56	+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
	57	+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
	58	+
	59	+#### Either the directory where the Tcl library is installed or the Tcl
	60	+# source code directory resides (depending on the value of the macro
	61	+# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
	62	+# this directory must have "include" and "lib" sub-directories. If
	63	+# this points to the Tcl source code directory, this directory must
	64	+# have "generic" and "win" sub-directories. The recommended usage
	65	+# here is to use the Sysinternals junction tool to create a hard
	66	+# link between a "tcl-8.x" sub-directory of the Fossil source code
	67	+# directory and the target Tcl directory. This removes the need to
	68	+# hard-code the necessary paths in this Makefile.
	69	+#
	70	+TCLDIR = $(SRCDIR)/../tcl-8.6
	71	+
	72	+#### The Tcl source code directory. This defaults to the same value as
	73	+# TCLDIR macro (above), which may not be correct. This value will
	74	+# only be used if the FOSSIL_TCL_SOURCE macro is defined.
	75	+#
	76	+TCLSRCDIR = $(TCLDIR)
	77	+
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
	80	+#
	81	+TCLINCDIR = $(TCLDIR)/include
	82	+TCLLIBDIR = $(TCLDIR)/lib
	83	+
	84	+#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
27	85	#
28		-ZINCDIR = /programs/gnuwin32/include
29		-ZLIBDIR = /programs/gnuwin32/lib
	86	+LIBTCL = -ltcl86
30	87
31	88	#### C Compile and options for use in building executables that
32	89	# will run on the target platform. This is usually the same
33	90	# as BCC, unless you are cross-compiling. This C compiler builds
34	91	# the finished binary for fossil. The BCC compiler above is used
35	92	# for building intermediate code-generator tools.
36	93	#
37	94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	95	+
	96	+# With HTTPS support
	97	+ifdef FOSSIL_ENABLE_SSL
	98	+TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
	99	+endif
	100	+
	101	+# With Tcl support
	102	+ifdef FOSSIL_ENABLE_TCL
	103	+ifdef FOSSIL_TCL_SOURCE
	104	+TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
	105	+else
	106	+TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
	107	+endif
	108	+endif
38	109
39	110	# With HTTPS support
40	111	ifdef FOSSIL_ENABLE_SSL
41	112	TCC += -DFOSSIL_ENABLE_SSL=1
42	113	endif
	114	+
	115	+# With Tcl support (statically linked)
	116	+ifdef FOSSIL_ENABLE_TCL
	117	+TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
	118	+endif
43	119
44	120	#### Extra arguments for linking the finished binary. Fossil needs
45	121	# to link against the Z-Lib compression library. There are no
46	122	# other mandatory dependencies. We add the -static option here
47	123	# so that we can build a static executable that will run in a
		@@ -48,28 +124,37 @@
48	124	# chroot jail.
49	125	#
50	126	LIB = -static
51	127	LIB += -lmingwex -lz
52	128
53		-# OpenSSL: Add the necessary libaries required.
	129	+# OpenSSL: Add the necessary libaries required, if enabled.
54	130	ifdef FOSSIL_ENABLE_SSL
55	131	LIB += -lssl -lcrypto -lgdi32
56	132	endif
	133	+
	134	+# Tcl: Add the necessary libaries required, if enabled.
	135	+ifdef FOSSIL_ENABLE_TCL
	136	+LIB += $(LIBTCL)
	137	+endif
57	138
58	139	#### These libraries MUST appear in the same order as they do for Tcl
59	140	# or linking with it will not work (exact reason unknown).
60	141	#
	142	+ifdef FOSSIL_ENABLE_TCL
	143	+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
	144	+else
61	145	LIB += -lws2_32
	146	+endif
62	147
63		-#### Tcl shell for use in running the fossil testsuite. This is only
64		-# used for testing. If you do not run
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
65	150	#
66	151	TCLSH = tclsh
67	152
68		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
69	154	#
70		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
71	156
72	157	#### Include a configuration file that can override any one of these settings.
73	158	#
74	159	-include config.w32
75	160
		@@ -395,20 +480,24 @@
395	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
396	481
397	482	$(VERSION): $(SRCDIR)/mkversion.c
398	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399	484
400		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
401	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
402	487	# the repository after running the tests.
403	488	test: $(OBJDIR) $(APPNAME)
404	489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405	490
406	491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407	492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408	493
409	494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
	495	+
	496	+ifdef FOSSIL_ENABLE_TCL
	497	+EXTRAOBJ += $(OBJDIR)/th_tcl.o
	498	+endif
410	499
411	500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
412	501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413	502
414	503	# This rule prevents make from using its default rules to try build
		@@ -415,11 +504,11 @@
415	504	# an executable named "manifest" out of the file named "manifest.c"
416	505	#
417	506	$(SRCDIR)/../manifest:
418	507	# noop
419	508
420		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
421	510	# command. "del" will not work here because it is not a separate command
422	511	# but a MSDOS-shell builtin.
423	512	#
424	513	clean:
425	514	rm -rf $(OBJDIR) $(APPNAME)
		@@ -1098,16 +1187,21 @@
1098	1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099	1188
1100	1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101	1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102	1191
1103		-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
	1192	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1104	1193
1105	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107	1196
1108	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1109	1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110	1199
1111	1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112	1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
	1202	+
	1203	+ifdef FOSSIL_ENABLE_TCL
	1204	+$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
	1205	+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
	1206	+endif
1113	1207
1114	1208

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
	@@ -20,28 +28,96 @@
20	BCC = gcc
21
22	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
23	#
24	# FOSSIL_ENABLE_SSL = 1









25
26	#### The directories where the zlib include and library files are located.









































27	#
28	ZINCDIR = /programs/gnuwin32/include
29	ZLIBDIR = /programs/gnuwin32/lib
30
31	#### C Compile and options for use in building executables that
32	# will run on the target platform. This is usually the same
33	# as BCC, unless you are cross-compiling. This C compiler builds
34	# the finished binary for fossil. The BCC compiler above is used
35	# for building intermediate code-generator tools.
36	#
37	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)














38
39	# With HTTPS support
40	ifdef FOSSIL_ENABLE_SSL
41	TCC += -DFOSSIL_ENABLE_SSL=1
42	endif





43
44	#### Extra arguments for linking the finished binary. Fossil needs
45	# to link against the Z-Lib compression library. There are no
46	# other mandatory dependencies. We add the -static option here
47	# so that we can build a static executable that will run in a
	@@ -48,28 +124,37 @@
48	# chroot jail.
49	#
50	LIB = -static
51	LIB += -lmingwex -lz
52
53	# OpenSSL: Add the necessary libaries required.
54	ifdef FOSSIL_ENABLE_SSL
55	LIB += -lssl -lcrypto -lgdi32
56	endif





57
58	#### These libraries MUST appear in the same order as they do for Tcl
59	# or linking with it will not work (exact reason unknown).
60	#



61	LIB += -lws2_32

62
63	#### Tcl shell for use in running the fossil testsuite. This is only
64	# used for testing. If you do not run
65	#
66	TCLSH = tclsh
67
68	#### Nullsoft installer makensis location
69	#
70	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
71
72	#### Include a configuration file that can override any one of these settings.
73	#
74	-include config.w32
75
	@@ -395,20 +480,24 @@
395	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
396
397	$(VERSION): $(SRCDIR)/mkversion.c
398	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399
400	# WARNING. DANGER. Running the testsuite modifies the repository the
401	# build is done from, i.e. the checkout belongs to. Do not sync/push
402	# the repository after running the tests.
403	test: $(OBJDIR) $(APPNAME)
404	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405
406	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408
409	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o




410
411	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
412	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413
414	# This rule prevents make from using its default rules to try build
	@@ -415,11 +504,11 @@
415	# an executable named "manifest" out of the file named "manifest.c"
416	#
417	$(SRCDIR)/../manifest:
418	# noop
419
420	# Requires msys to be installed in addition to the mingw, for the "rm"
421	# command. "del" will not work here because it is not a separate command
422	# but a MSDOS-shell builtin.
423	#
424	clean:
425	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1098,16 +1187,21 @@
1098	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099
1100	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102
1103	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
1105	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107
1108	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1109	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110
1111	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o





1113
1114

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
	@@ -20,28 +28,96 @@
28	BCC = gcc
29
30	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
31	#
32	# FOSSIL_ENABLE_SSL = 1
33
34	#### Enable scripting support via Tcl/Tk
35	#
36	# FOSSIL_ENABLE_TCL = 1
37
38	#### Use the Tcl source directory instead of the install directory?
39	# This is useful when Tcl has been compiled statically with MinGW.
40	#
41	FOSSIL_TCL_SOURCE = 1
42
43	#### The directories where the zlib include and library files are located.
44	# The recommended usage here is to use the Sysinternals junction tool
45	# to create a hard link between an "zlib-1.x.y" sub-directory of the
46	# Fossil source code directory and the target zlib source directory.
47	#
48	ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49	ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51	#### The directories where the OpenSSL include and library files are located.
52	# The recommended usage here is to use the Sysinternals junction tool
53	# to create a hard link between an "openssl-1.x" sub-directory of the
54	# Fossil source code directory and the target OpenSSL source directory.
55	#
56	OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57	OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59	#### Either the directory where the Tcl library is installed or the Tcl
60	# source code directory resides (depending on the value of the macro
61	# FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62	# this directory must have "include" and "lib" sub-directories. If
63	# this points to the Tcl source code directory, this directory must
64	# have "generic" and "win" sub-directories. The recommended usage
65	# here is to use the Sysinternals junction tool to create a hard
66	# link between a "tcl-8.x" sub-directory of the Fossil source code
67	# directory and the target Tcl directory. This removes the need to
68	# hard-code the necessary paths in this Makefile.
69	#
70	TCLDIR = $(SRCDIR)/../tcl-8.6
71
72	#### The Tcl source code directory. This defaults to the same value as
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
85	#
86	LIBTCL = -ltcl86

87
88	#### C Compile and options for use in building executables that
89	# will run on the target platform. This is usually the same
90	# as BCC, unless you are cross-compiling. This C compiler builds
91	# the finished binary for fossil. The BCC compiler above is used
92	# for building intermediate code-generator tools.
93	#
94	TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96	# With HTTPS support
97	ifdef FOSSIL_ENABLE_SSL
98	TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99	endif
100
101	# With Tcl support
102	ifdef FOSSIL_ENABLE_TCL
103	ifdef FOSSIL_TCL_SOURCE
104	TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win
105	else
106	TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
107	endif
108	endif
109
110	# With HTTPS support
111	ifdef FOSSIL_ENABLE_SSL
112	TCC += -DFOSSIL_ENABLE_SSL=1
113	endif
114
115	# With Tcl support (statically linked)
116	ifdef FOSSIL_ENABLE_TCL
117	TCC += -DFOSSIL_ENABLE_TCL=1 -DSTATIC_BUILD
118	endif
119
120	#### Extra arguments for linking the finished binary. Fossil needs
121	# to link against the Z-Lib compression library. There are no
122	# other mandatory dependencies. We add the -static option here
123	# so that we can build a static executable that will run in a
	@@ -48,28 +124,37 @@
124	# chroot jail.
125	#
126	LIB = -static
127	LIB += -lmingwex -lz
128
129	# OpenSSL: Add the necessary libaries required, if enabled.
130	ifdef FOSSIL_ENABLE_SSL
131	LIB += -lssl -lcrypto -lgdi32
132	endif
133
134	# Tcl: Add the necessary libaries required, if enabled.
135	ifdef FOSSIL_ENABLE_TCL
136	LIB += $(LIBTCL)
137	endif
138
139	#### These libraries MUST appear in the same order as they do for Tcl
140	# or linking with it will not work (exact reason unknown).
141	#
142	ifdef FOSSIL_ENABLE_TCL
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -395,20 +480,24 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
491	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
492	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
493
494	EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
495
496	ifdef FOSSIL_ENABLE_TCL
497	EXTRAOBJ += $(OBJDIR)/th_tcl.o
498	endif
499
500	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/icon.o
501	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
502
503	# This rule prevents make from using its default rules to try build
	@@ -415,11 +504,11 @@
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1098,16 +1187,21 @@
1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1199
1200	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1201	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1202
1203	ifdef FOSSIL_ENABLE_TCL
1204	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1205	$(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1206	endif
1207
1208

M win/Makefile.mingw.mistachkin

+18 -9

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1,8 +1,16 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
		@@ -65,11 +73,12 @@
65	73	# TCLDIR macro (above), which may not be correct. This value will
66	74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
67	75	#
68	76	TCLSRCDIR = $(TCLDIR)
69	77
70		-#### The Tcl include and library directories.
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
71	80	#
72	81	TCLINCDIR = $(TCLDIR)/include
73	82	TCLLIBDIR = $(TCLDIR)/lib
74	83
75	84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
		@@ -134,18 +143,18 @@
134	143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
135	144	else
136	145	LIB += -lws2_32
137	146	endif
138	147
139		-#### Tcl shell for use in running the fossil testsuite. This is only
140		-# used for testing. If you do not run
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
141	150	#
142	151	TCLSH = tclsh
143	152
144		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
145	154	#
146		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
147	156
148	157	#### Include a configuration file that can override any one of these settings.
149	158	#
150	159	-include config.w32
151	160
		@@ -471,11 +480,11 @@
471	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
472	481
473	482	$(VERSION): $(SRCDIR)/mkversion.c
474	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
475	484
476		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
477	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
478	487	# the repository after running the tests.
479	488	test: $(OBJDIR) $(APPNAME)
480	489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
481	490
		@@ -495,11 +504,11 @@
495	504	# an executable named "manifest" out of the file named "manifest.c"
496	505	#
497	506	$(SRCDIR)/../manifest:
498	507	# noop
499	508
500		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
501	510	# command. "del" will not work here because it is not a separate command
502	511	# but a MSDOS-shell builtin.
503	512	#
504	513	clean:
505	514	rm -rf $(OBJDIR) $(APPNAME)
		@@ -1178,11 +1187,11 @@
1178	1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179	1188
1180	1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1181	1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1182	1191
1183		-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
	1192	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1184	1193
1185	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1186	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1187	1196
1188	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1189	1198

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
	@@ -65,11 +73,12 @@
65	# TCLDIR macro (above), which may not be correct. This value will
66	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
67	#
68	TCLSRCDIR = $(TCLDIR)
69
70	#### The Tcl include and library directories.

71	#
72	TCLINCDIR = $(TCLDIR)/include
73	TCLLIBDIR = $(TCLDIR)/lib
74
75	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	@@ -134,18 +143,18 @@
134	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
135	else
136	LIB += -lws2_32
137	endif
138
139	#### Tcl shell for use in running the fossil testsuite. This is only
140	# used for testing. If you do not run
141	#
142	TCLSH = tclsh
143
144	#### Nullsoft installer makensis location
145	#
146	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
147
148	#### Include a configuration file that can override any one of these settings.
149	#
150	-include config.w32
151
	@@ -471,11 +480,11 @@
471	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
472
473	$(VERSION): $(SRCDIR)/mkversion.c
474	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
475
476	# WARNING. DANGER. Running the testsuite modifies the repository the
477	# build is done from, i.e. the checkout belongs to. Do not sync/push
478	# the repository after running the tests.
479	test: $(OBJDIR) $(APPNAME)
480	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
481
	@@ -495,11 +504,11 @@
495	# an executable named "manifest" out of the file named "manifest.c"
496	#
497	$(SRCDIR)/../manifest:
498	# noop
499
500	# Requires msys to be installed in addition to the mingw, for the "rm"
501	# command. "del" will not work here because it is not a separate command
502	# but a MSDOS-shell builtin.
503	#
504	clean:
505	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1178,11 +1187,11 @@
1178	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179
1180	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1181	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1182
1183	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1184
1185	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1186	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1187
1188	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1189

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
	@@ -65,11 +73,12 @@
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	@@ -134,18 +143,18 @@
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -471,11 +480,11 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
	@@ -495,11 +504,11 @@
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1178,11 +1187,11 @@
1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198

M win/Makefile.mingw.mistachkin

+18 -9

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -1,8 +1,16 @@
1	1	#!/usr/bin/make
2	2	#
3		-# This is a makefile for us on windows using mingw.
	3	+##############################################################################
	4	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	5	+##############################################################################
	6	+#
	7	+# This file is automatically generated. Instead of editing this
	8	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
	9	+# to regenerate this file.
	10	+#
	11	+# This is a makefile for us on windows using MinGW.
4	12	#
5	13	#### The toplevel directory of the source tree. Fossil can be built
6	14	# in a directory that is separate from the source tree. Just change
7	15	# the following to point from the build directory to the src/ folder.
8	16	#
		@@ -65,11 +73,12 @@
65	73	# TCLDIR macro (above), which may not be correct. This value will
66	74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
67	75	#
68	76	TCLSRCDIR = $(TCLDIR)
69	77
70		-#### The Tcl include and library directories.
	78	+#### The Tcl include and library directories. These values will only be
	79	+# used if the FOSSIL_TCL_SOURCE macro is not defined.
71	80	#
72	81	TCLINCDIR = $(TCLDIR)/include
73	82	TCLLIBDIR = $(TCLDIR)/lib
74	83
75	84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
		@@ -134,18 +143,18 @@
134	143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
135	144	else
136	145	LIB += -lws2_32
137	146	endif
138	147
139		-#### Tcl shell for use in running the fossil testsuite. This is only
140		-# used for testing. If you do not run
	148	+#### Tcl shell for use in running the fossil test suite. This is only
	149	+# used for testing.
141	150	#
142	151	TCLSH = tclsh
143	152
144		-#### Nullsoft installer makensis location
	153	+#### Nullsoft installer MakeNSIS location
145	154	#
146		-MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
	155	+MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
147	156
148	157	#### Include a configuration file that can override any one of these settings.
149	158	#
150	159	-include config.w32
151	160
		@@ -471,11 +480,11 @@
471	480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
472	481
473	482	$(VERSION): $(SRCDIR)/mkversion.c
474	483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
475	484
476		-# WARNING. DANGER. Running the testsuite modifies the repository the
	485	+# WARNING. DANGER. Running the test suite modifies the repository the
477	486	# build is done from, i.e. the checkout belongs to. Do not sync/push
478	487	# the repository after running the tests.
479	488	test: $(OBJDIR) $(APPNAME)
480	489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
481	490
		@@ -495,11 +504,11 @@
495	504	# an executable named "manifest" out of the file named "manifest.c"
496	505	#
497	506	$(SRCDIR)/../manifest:
498	507	# noop
499	508
500		-# Requires msys to be installed in addition to the mingw, for the "rm"
	509	+# Requires MSYS to be installed in addition to the MinGW, for the "rm"
501	510	# command. "del" will not work here because it is not a separate command
502	511	# but a MSDOS-shell builtin.
503	512	#
504	513	clean:
505	514	rm -rf $(OBJDIR) $(APPNAME)
		@@ -1178,11 +1187,11 @@
1178	1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179	1188
1180	1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1181	1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1182	1191
1183		-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
	1192	+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1184	1193
1185	1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1186	1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1187	1196
1188	1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1189	1198

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	# This is a makefile for us on windows using mingw.








4	#
5	#### The toplevel directory of the source tree. Fossil can be built
6	# in a directory that is separate from the source tree. Just change
7	# the following to point from the build directory to the src/ folder.
8	#
	@@ -65,11 +73,12 @@
65	# TCLDIR macro (above), which may not be correct. This value will
66	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
67	#
68	TCLSRCDIR = $(TCLDIR)
69
70	#### The Tcl include and library directories.

71	#
72	TCLINCDIR = $(TCLDIR)/include
73	TCLLIBDIR = $(TCLDIR)/lib
74
75	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	@@ -134,18 +143,18 @@
134	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
135	else
136	LIB += -lws2_32
137	endif
138
139	#### Tcl shell for use in running the fossil testsuite. This is only
140	# used for testing. If you do not run
141	#
142	TCLSH = tclsh
143
144	#### Nullsoft installer makensis location
145	#
146	MAKENSIS = "c:\Program Files\NSIS\makensis.exe"
147
148	#### Include a configuration file that can override any one of these settings.
149	#
150	-include config.w32
151
	@@ -471,11 +480,11 @@
471	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
472
473	$(VERSION): $(SRCDIR)/mkversion.c
474	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
475
476	# WARNING. DANGER. Running the testsuite modifies the repository the
477	# build is done from, i.e. the checkout belongs to. Do not sync/push
478	# the repository after running the tests.
479	test: $(OBJDIR) $(APPNAME)
480	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
481
	@@ -495,11 +504,11 @@
495	# an executable named "manifest" out of the file named "manifest.c"
496	#
497	$(SRCDIR)/../manifest:
498	# noop
499
500	# Requires msys to be installed in addition to the mingw, for the "rm"
501	# command. "del" will not work here because it is not a separate command
502	# but a MSDOS-shell builtin.
503	#
504	clean:
505	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1178,11 +1187,11 @@
1178	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1179
1180	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1181	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1182
1183	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1184
1185	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1186	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1187
1188	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1189

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -1,8 +1,16 @@
1	#!/usr/bin/make
2	#
3	##############################################################################
4	# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5	##############################################################################
6	#
7	# This file is automatically generated. Instead of editing this
8	# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9	# to regenerate this file.
10	#
11	# This is a makefile for us on windows using MinGW.
12	#
13	#### The toplevel directory of the source tree. Fossil can be built
14	# in a directory that is separate from the source tree. Just change
15	# the following to point from the build directory to the src/ folder.
16	#
	@@ -65,11 +73,12 @@
73	# TCLDIR macro (above), which may not be correct. This value will
74	# only be used if the FOSSIL_TCL_SOURCE macro is defined.
75	#
76	TCLSRCDIR = $(TCLDIR)
77
78	#### The Tcl include and library directories. These values will only be
79	# used if the FOSSIL_TCL_SOURCE macro is not defined.
80	#
81	TCLINCDIR = $(TCLDIR)/include
82	TCLLIBDIR = $(TCLDIR)/lib
83
84	#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
	@@ -134,18 +143,18 @@
143	LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
144	else
145	LIB += -lws2_32
146	endif
147
148	#### Tcl shell for use in running the fossil test suite. This is only
149	# used for testing.
150	#
151	TCLSH = tclsh
152
153	#### Nullsoft installer MakeNSIS location
154	#
155	MAKENSIS = "$(ProgramFiles)\NSIS\MakeNSIS.exe"
156
157	#### Include a configuration file that can override any one of these settings.
158	#
159	-include config.w32
160
	@@ -471,11 +480,11 @@
480	$(BCC) -o $(OBJDIR)/mkindex $(SRCDIR)/mkindex.c
481
482	$(VERSION): $(SRCDIR)/mkversion.c
483	$(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
484
485	# WARNING. DANGER. Running the test suite modifies the repository the
486	# build is done from, i.e. the checkout belongs to. Do not sync/push
487	# the repository after running the tests.
488	test: $(OBJDIR) $(APPNAME)
489	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
490
	@@ -495,11 +504,11 @@
504	# an executable named "manifest" out of the file named "manifest.c"
505	#
506	$(SRCDIR)/../manifest:
507	# noop
508
509	# Requires MSYS to be installed in addition to the MinGW, for the "rm"
510	# command. "del" will not work here because it is not a separate command
511	# but a MSDOS-shell builtin.
512	#
513	clean:
514	rm -rf $(OBJDIR) $(APPNAME)
	@@ -1178,11 +1187,11 @@
1187	$(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1188
1189	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1190	$(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1191
1192	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1193
1194	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1195	$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1196
1197	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1198

M win/Makefile.msc

+6 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	OX = .
10	14	O = .obj
11	15

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	OX = .
10	O = .obj
11

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
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	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	OX = .
14	O = .obj
15

M win/Makefile.msc

+6 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1,10 +1,14 @@
1		-# DO NOT EDIT
	1	+#
	2	+##############################################################################
	3	+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
	4	+##############################################################################
2	5	#
3	6	# This file is automatically generated. Instead of editing this
4		-# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
	7	+# file, edit "makemake.tcl" then run "tclsh makemake.tcl"
5	8	# to regenerate this file.
	9	+#
6	10	B = ..
7	11	SRCDIR = $B\src
8	12	OBJDIR = .
9	13	OX = .
10	14	O = .obj
11	15

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
1	# DO NOT EDIT



2	#
3	# This file is automatically generated. Instead of editing this
4	# file, edit "makemake.tcl" then run "tclsh src/makemake.tcl"
5	# to regenerate this file.

6	B = ..
7	SRCDIR = $B\src
8	OBJDIR = .
9	OX = .
10	O = .obj
11

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1,10 +1,14 @@
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	#
10	B = ..
11	SRCDIR = $B\src
12	OBJDIR = .
13	OX = .
14	O = .obj
15

Fossil SCM

Keyboard Shortcuts