6e9c044e3b7… — Fossil SCM

M src/content.c

+4 -1

		--- src/content.c
		+++ src/content.c
		@@ -667,11 +667,14 @@
667	667
668	668
669	669	/*
670	670	** COMMAND: test-content-put
671	671	**
672		-** Extract a blob from a file and write it into the database
	672	+** Usage: %fossil test-content-put FILE
	673	+**
	674	+** Read the content of FILE and add it to the Blob table as a new
	675	+** artifact using a direct call to content_put().
673	676	*/
674	677	void test_content_put_cmd(void){
675	678	int rid;
676	679	Blob content;
677	680	if( g.argc!=3 ) usage("FILENAME");
678	681

	--- src/content.c
	+++ src/content.c
	@@ -667,11 +667,14 @@
667
668
669	/*
670	** COMMAND: test-content-put
671	**
672	** Extract a blob from a file and write it into the database



673	*/
674	void test_content_put_cmd(void){
675	int rid;
676	Blob content;
677	if( g.argc!=3 ) usage("FILENAME");
678

	--- src/content.c
	+++ src/content.c
	@@ -667,11 +667,14 @@
667
668
669	/*
670	** COMMAND: test-content-put
671	**
672	** Usage: %fossil test-content-put FILE
673	**
674	** Read the content of FILE and add it to the Blob table as a new
675	** artifact using a direct call to content_put().
676	*/
677	void test_content_put_cmd(void){
678	int rid;
679	Blob content;
680	if( g.argc!=3 ) usage("FILENAME");
681

M src/makemake.tcl

+11

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -364,10 +364,14 @@
364	364	# will run on the platform that is doing the build. This is used
365	365	# to compile code-generator programs as part of the build process.
366	366	# See TCC below for the C compiler for building the finished binary.
367	367	#
368	368	BCC = gcc
	369	+
	370	+#### Enable compiling with debug symbols (much larger binary)
	371	+#
	372	+# FOSSIL_ENABLE_SYMBOLS = 1
369	373
370	374	#### Enable JSON (http://www.json.org) support using "cson"
371	375	#
372	376	# FOSSIL_ENABLE_JSON = 1
373	377
		@@ -442,10 +446,17 @@
442	446	# as BCC, unless you are cross-compiling. This C compiler builds
443	447	# the finished binary for fossil. The BCC compiler above is used
444	448	# for building intermediate code-generator tools.
445	449	#
446	450	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	451	+
	452	+#### Add the necessary command line options to build with debugging
	453	+# symbols, if enabled.
	454	+#
	455	+ifdef FOSSIL_ENABLE_SYMBOLS
	456	+TCC += -g
	457	+endif
447	458
448	459	#### Compile resources for use in building executables that will run
449	460	# on the target platform.
450	461	#
451	462	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
452	463

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -364,10 +364,14 @@
364	# will run on the platform that is doing the build. This is used
365	# to compile code-generator programs as part of the build process.
366	# See TCC below for the C compiler for building the finished binary.
367	#
368	BCC = gcc




369
370	#### Enable JSON (http://www.json.org) support using "cson"
371	#
372	# FOSSIL_ENABLE_JSON = 1
373
	@@ -442,10 +446,17 @@
442	# as BCC, unless you are cross-compiling. This C compiler builds
443	# the finished binary for fossil. The BCC compiler above is used
444	# for building intermediate code-generator tools.
445	#
446	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)







447
448	#### Compile resources for use in building executables that will run
449	# on the target platform.
450	#
451	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
452

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -364,10 +364,14 @@
364	# will run on the platform that is doing the build. This is used
365	# to compile code-generator programs as part of the build process.
366	# See TCC below for the C compiler for building the finished binary.
367	#
368	BCC = gcc
369
370	#### Enable compiling with debug symbols (much larger binary)
371	#
372	# FOSSIL_ENABLE_SYMBOLS = 1
373
374	#### Enable JSON (http://www.json.org) support using "cson"
375	#
376	# FOSSIL_ENABLE_JSON = 1
377
	@@ -442,10 +446,17 @@
446	# as BCC, unless you are cross-compiling. This C compiler builds
447	# the finished binary for fossil. The BCC compiler above is used
448	# for building intermediate code-generator tools.
449	#
450	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
451
452	#### Add the necessary command line options to build with debugging
453	# symbols, if enabled.
454	#
455	ifdef FOSSIL_ENABLE_SYMBOLS
456	TCC += -g
457	endif
458
459	#### Compile resources for use in building executables that will run
460	# on the target platform.
461	#
462	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
463

M src/manifest.c

+1 -1

		--- src/manifest.c
		+++ src/manifest.c
		@@ -833,11 +833,11 @@
833	833	default: {
834	834	SYNTAX("unrecognized card");
835	835	}
836	836	}
837	837	}
838		- if( x.z<x.zEnd ) SYNTAX("card in the wrong order");
	838	+ if( x.z<x.zEnd ) SYNTAX("extra characters at end of card");
839	839
840	840	if( p->nFile>0 \|\| p->zRepoCksum!=0 \|\| p->zBaseline ){
841	841	if( p->nCChild>0 ) SYNTAX("M-card in check-in");
842	842	if( p->rDate<=0.0 ) SYNTAX("missing date for check-in");
843	843	if( p->nField>0 ) SYNTAX("J-card in check-in");
844	844

	--- src/manifest.c
	+++ src/manifest.c
	@@ -833,11 +833,11 @@
833	default: {
834	SYNTAX("unrecognized card");
835	}
836	}
837	}
838	if( x.z<x.zEnd ) SYNTAX("card in the wrong order");
839
840	if( p->nFile>0 \|\| p->zRepoCksum!=0 \|\| p->zBaseline ){
841	if( p->nCChild>0 ) SYNTAX("M-card in check-in");
842	if( p->rDate<=0.0 ) SYNTAX("missing date for check-in");
843	if( p->nField>0 ) SYNTAX("J-card in check-in");
844

	--- src/manifest.c
	+++ src/manifest.c
	@@ -833,11 +833,11 @@
833	default: {
834	SYNTAX("unrecognized card");
835	}
836	}
837	}
838	if( x.z<x.zEnd ) SYNTAX("extra characters at end of card");
839
840	if( p->nFile>0 \|\| p->zRepoCksum!=0 \|\| p->zBaseline ){
841	if( p->nCChild>0 ) SYNTAX("M-card in check-in");
842	if( p->rDate<=0.0 ) SYNTAX("missing date for check-in");
843	if( p->nField>0 ) SYNTAX("J-card in check-in");
844

M win/Makefile.mingw.mistachkin

+12 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -35,10 +35,14 @@
35	35	# will run on the platform that is doing the build. This is used
36	36	# to compile code-generator programs as part of the build process.
37	37	# See TCC below for the C compiler for building the finished binary.
38	38	#
39	39	BCC = gcc
	40	+
	41	+#### Enable compiling with debug symbols (much larger binary)
	42	+#
	43	+# FOSSIL_ENABLE_SYMBOLS = 1
40	44
41	45	#### Enable JSON (http://www.json.org) support using "cson"
42	46	#
43	47	FOSSIL_ENABLE_JSON = 1
44	48
		@@ -112,11 +116,18 @@
112	116	# will run on the target platform. This is usually the same
113	117	# as BCC, unless you are cross-compiling. This C compiler builds
114	118	# the finished binary for fossil. The BCC compiler above is used
115	119	# for building intermediate code-generator tools.
116	120	#
117		-TCC = $(PREFIX)gcc -g -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	121	+TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
	122	+
	123	+#### Add the necessary command line options to build with debugging
	124	+# symbols, if enabled.
	125	+#
	126	+ifdef FOSSIL_ENABLE_SYMBOLS
	127	+TCC += -g
	128	+endif
118	129
119	130	#### Compile resources for use in building executables that will run
120	131	# on the target platform.
121	132	#
122	133	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
123	134

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -35,10 +35,14 @@
35	# will run on the platform that is doing the build. This is used
36	# to compile code-generator programs as part of the build process.
37	# See TCC below for the C compiler for building the finished binary.
38	#
39	BCC = gcc




40
41	#### Enable JSON (http://www.json.org) support using "cson"
42	#
43	FOSSIL_ENABLE_JSON = 1
44
	@@ -112,11 +116,18 @@
112	# will run on the target platform. This is usually the same
113	# as BCC, unless you are cross-compiling. This C compiler builds
114	# the finished binary for fossil. The BCC compiler above is used
115	# for building intermediate code-generator tools.
116	#
117	TCC = $(PREFIX)gcc -g -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)







118
119	#### Compile resources for use in building executables that will run
120	# on the target platform.
121	#
122	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
123

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -35,10 +35,14 @@
35	# will run on the platform that is doing the build. This is used
36	# to compile code-generator programs as part of the build process.
37	# See TCC below for the C compiler for building the finished binary.
38	#
39	BCC = gcc
40
41	#### Enable compiling with debug symbols (much larger binary)
42	#
43	# FOSSIL_ENABLE_SYMBOLS = 1
44
45	#### Enable JSON (http://www.json.org) support using "cson"
46	#
47	FOSSIL_ENABLE_JSON = 1
48
	@@ -112,11 +116,18 @@
116	# will run on the target platform. This is usually the same
117	# as BCC, unless you are cross-compiling. This C compiler builds
118	# the finished binary for fossil. The BCC compiler above is used
119	# for building intermediate code-generator tools.
120	#
121	TCC = $(PREFIX)gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
122
123	#### Add the necessary command line options to build with debugging
124	# symbols, if enabled.
125	#
126	ifdef FOSSIL_ENABLE_SYMBOLS
127	TCC += -g
128	endif
129
130	#### Compile resources for use in building executables that will run
131	# on the target platform.
132	#
133	RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
134

Fossil SCM

Keyboard Shortcuts