5acc36b1252… — Fossil SCM

M src/db.c

-5

		--- src/db.c
		+++ src/db.c
		@@ -2243,15 +2243,10 @@
2243	2243	**
2244	2244	** manifest If enabled, automatically create files "manifest" and
2245	2245	** (versionable) "manifest.uuid" in every checkout. The SQLite and
2246	2246	** Fossil repositories both require this. Default: off.
2247	2247	**
2248		-** markdown If enabled (and Fossil was compiled with markdown
2249		-** support), the markdown engine will be used to render
2250		-** embedded documentation conforming to the appropriate
2251		-** content types (e.g. "text/x-markdown"). Default: off.
2252		-**
2253	2248	** max-upload A limit on the size of uplink HTTP requests. The
2254	2249	** default is 250000 bytes.
2255	2250	**
2256	2251	** mtime-changes Use file modification times (mtimes) to detect when
2257	2252	** files have been modified. (Default "on".)
2258	2253

	--- src/db.c
	+++ src/db.c
	@@ -2243,15 +2243,10 @@
2243	**
2244	** manifest If enabled, automatically create files "manifest" and
2245	** (versionable) "manifest.uuid" in every checkout. The SQLite and
2246	** Fossil repositories both require this. Default: off.
2247	**
2248	** markdown If enabled (and Fossil was compiled with markdown
2249	** support), the markdown engine will be used to render
2250	** embedded documentation conforming to the appropriate
2251	** content types (e.g. "text/x-markdown"). Default: off.
2252	**
2253	** max-upload A limit on the size of uplink HTTP requests. The
2254	** default is 250000 bytes.
2255	**
2256	** mtime-changes Use file modification times (mtimes) to detect when
2257	** files have been modified. (Default "on".)
2258

	--- src/db.c
	+++ src/db.c
	@@ -2243,15 +2243,10 @@
2243	**
2244	** manifest If enabled, automatically create files "manifest" and
2245	** (versionable) "manifest.uuid" in every checkout. The SQLite and
2246	** Fossil repositories both require this. Default: off.
2247	**





2248	** max-upload A limit on the size of uplink HTTP requests. The
2249	** default is 250000 bytes.
2250	**
2251	** mtime-changes Use file modification times (mtimes) to detect when
2252	** files have been modified. (Default "on".)
2253

M win/Makefile.mingw.mistachkin

-10

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -44,14 +44,10 @@
44	44
45	45	#### Enable JSON (http://www.json.org) support using "cson"
46	46	#
47	47	FOSSIL_ENABLE_JSON = 1
48	48
49		-#### Enable markdown support
50		-#
51		-FOSSIL_ENABLE_MARKDOWN = 1
52		-
53	49	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
54	50	#
55	51	FOSSIL_ENABLE_SSL = 1
56	52
57	53	#### Enable scripting support via Tcl/Tk
		@@ -189,16 +185,10 @@
189	185	ifdef FOSSIL_ENABLE_JSON
190	186	TCC += -DFOSSIL_ENABLE_JSON=1
191	187	RCC += -DFOSSIL_ENABLE_JSON=1
192	188	endif
193	189
194		-# With markdown support
195		-ifdef FOSSIL_ENABLE_MARKDOWN
196		-TCC += -DFOSSIL_ENABLE_MARKDOWN=1
197		-RCC += -DFOSSIL_ENABLE_MARKDOWN=1
198		-endif
199		-
200	190	#### We add the -static option here so that we can build a static
201	191	# executable that will run in a chroot jail.
202	192	#
203	193	LIB = -static
204	194
205	195

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -44,14 +44,10 @@
44
45	#### Enable JSON (http://www.json.org) support using "cson"
46	#
47	FOSSIL_ENABLE_JSON = 1
48
49	#### Enable markdown support
50	#
51	FOSSIL_ENABLE_MARKDOWN = 1
52
53	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
54	#
55	FOSSIL_ENABLE_SSL = 1
56
57	#### Enable scripting support via Tcl/Tk
	@@ -189,16 +185,10 @@
189	ifdef FOSSIL_ENABLE_JSON
190	TCC += -DFOSSIL_ENABLE_JSON=1
191	RCC += -DFOSSIL_ENABLE_JSON=1
192	endif
193
194	# With markdown support
195	ifdef FOSSIL_ENABLE_MARKDOWN
196	TCC += -DFOSSIL_ENABLE_MARKDOWN=1
197	RCC += -DFOSSIL_ENABLE_MARKDOWN=1
198	endif
199
200	#### We add the -static option here so that we can build a static
201	# executable that will run in a chroot jail.
202	#
203	LIB = -static
204
205

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -44,14 +44,10 @@
44
45	#### Enable JSON (http://www.json.org) support using "cson"
46	#
47	FOSSIL_ENABLE_JSON = 1
48




49	#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
50	#
51	FOSSIL_ENABLE_SSL = 1
52
53	#### Enable scripting support via Tcl/Tk
	@@ -189,16 +185,10 @@
185	ifdef FOSSIL_ENABLE_JSON
186	TCC += -DFOSSIL_ENABLE_JSON=1
187	RCC += -DFOSSIL_ENABLE_JSON=1
188	endif
189






190	#### We add the -static option here so that we can build a static
191	# executable that will run in a chroot jail.
192	#
193	LIB = -static
194
195

M win/fossil.rc

-2

		--- win/fossil.rc
		+++ win/fossil.rc
		@@ -108,13 +108,11 @@
108	108	#endif
109	109	#endif
110	110	#ifdef FOSSIL_ENABLE_JSON
111	111	VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
112	112	#endif
113		-#ifdef FOSSIL_ENABLE_MARKDOWN
114	113	VALUE "MarkdownEnabled", "Yes\0"
115		-#endif
116	114	END
117	115	END
118	116	BLOCK "VarFileInfo"
119	117	BEGIN
120	118	VALUE "Translation", 0x409, 0x4B0
121	119

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -108,13 +108,11 @@
108	#endif
109	#endif
110	#ifdef FOSSIL_ENABLE_JSON
111	VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
112	#endif
113	#ifdef FOSSIL_ENABLE_MARKDOWN
114	VALUE "MarkdownEnabled", "Yes\0"
115	#endif
116	END
117	END
118	BLOCK "VarFileInfo"
119	BEGIN
120	VALUE "Translation", 0x409, 0x4B0
121

	--- win/fossil.rc
	+++ win/fossil.rc
	@@ -108,13 +108,11 @@
108	#endif
109	#endif
110	#ifdef FOSSIL_ENABLE_JSON
111	VALUE "JsonEnabled", "Yes, cson " FOSSIL_JSON_API_VERSION "\0"
112	#endif

113	VALUE "MarkdownEnabled", "Yes\0"

114	END
115	END
116	BLOCK "VarFileInfo"
117	BEGIN
118	VALUE "Translation", 0x409, 0x4B0
119

Fossil SCM