Fossil SCM

Improve makefile integration for the codecheck1 tool.

mistachkin 2014-10-20 20:47 UTC compile-time-print-checking

Commit 5edc01934c5ca5851ffbf77b29cacd8a79fa7125

Parent 9eb3b6ce80166ed…

5 files changed +9 -9 +4 -3 +2 -4 +2 -4 +3 -2

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

M src/makemake.tcl

+9 -9

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -785,11 +785,11 @@
785	785	endif}
786	786
787	787	writeln {
788	788	all: $(OBJDIR) $(APPNAME)
789	789
790		-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
	790	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
791	791	ifdef USE_WINDOWS
792	792	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
793	793	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
794	794	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
795	795	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
		@@ -839,13 +839,10 @@
839	839	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
840	840
841	841	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
842	842	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
843	843
844		-$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
845		- $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
846		-
847	844	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
848	845	# to 1. If it is set to 1, then there is no need to build or link
849	846	# the sqlite3.o object. Instead, the system SQLite will be linked
850	847	# using -lsqlite3.
851	848	SQLITE3_OBJ.1 =
		@@ -901,10 +898,11 @@
901	898	ifdef FOSSIL_BUILD_SSL
902	899	APPTARGETS += openssl
903	900	endif
904	901
905	902	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
	903	+ $(CODECHECK1) $(TRANS_SRC)
906	904	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
907	905
908	906	# This rule prevents make from using its default rules to try build
909	907	# an executable named "manifest" out of the file named "manifest.c"
910	908	#
		@@ -1051,12 +1049,13 @@
1051	1049
1052	1050	APPNAME = $(OBJDIR)\fossil$(E)
1053	1051
1054	1052	all: $(APPNAME)
1055	1053
1056		-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
	1054	+$(APPNAME) : translate$E mkindex$E codecheck1$E headers $(OBJ) $(OBJDIR)\link
1057	1055	cd $(OBJDIR)
	1056	+ codecheck1$E $(SRC)
1058	1057	$(DMDIR)\bin\link @link
1059	1058
1060	1059	$(OBJDIR)\fossil.res: $B\win\fossil.rc
1061	1060	$(RC) $(RCFLAGS) -o$@ $**
1062	1061
		@@ -1080,11 +1079,11 @@
1080	1079	$(BCC) -o$@ $**
1081	1080
1082	1081	mkindex$E: $(SRCDIR)\mkindex.c
1083	1082	$(BCC) -o$@ $**
1084	1083
1085		-version$E: $B\src\mkversion.c
	1084	+mkversion$E: $(SRCDIR)\mkversion.c
1086	1085	$(BCC) -o$@ $**
1087	1086
1088	1087	codecheck1$E: $(SRCDIR)\codecheck1.c
1089	1088	$(BCC) -o$@ $**
1090	1089
		@@ -1101,11 +1100,11 @@
1101	1100	$(TCC) -o$@ -c $**
1102	1101
1103	1102	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1104	1103	cp $@ $@
1105	1104
1106		-VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
	1105	+VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1107	1106	+$** > $@
1108	1107
1109	1108	page_index.h: mkindex$E $(SRC)
1110	1109	+$** > $@
1111	1110
		@@ -1415,12 +1414,13 @@
1415	1414	!ifdef FOSSIL_BUILD_SSL
1416	1415	APPTARGETS = $(APPTARGETS) openssl
1417	1416	!endif
1418	1417	!endif
1419	1418
1420		-$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
	1419	+$(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts
1421	1420	cd $(OX)
	1421	+ codecheck1$E $(SRC)
1422	1422	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1423	1423
1424	1424	$(OX)\linkopts: $B\win\Makefile.msc}
1425	1425	set redir {>}
1426	1426	foreach s [lsort [concat $src $AdditionalObj]] {
		@@ -1443,11 +1443,11 @@
1443	1443	$(BCC) $**
1444	1444
1445	1445	mkindex$E: $(SRCDIR)\mkindex.c
1446	1446	$(BCC) $**
1447	1447
1448		-mkversion$E: $B\src\mkversion.c
	1448	+mkversion$E: $(SRCDIR)\mkversion.c
1449	1449	$(BCC) $**
1450	1450
1451	1451	codecheck1$E: $(SRCDIR)\codecheck1.c
1452	1452	$(BCC) $**
1453	1453
1454	1454

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -785,11 +785,11 @@
785	endif}
786
787	writeln {
788	all: $(OBJDIR) $(APPNAME)
789
790	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
791	ifdef USE_WINDOWS
792	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
793	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
794	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
795	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -839,13 +839,10 @@
839	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
840
841	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
842	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
843
844	$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
845	$(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
846
847	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
848	# to 1. If it is set to 1, then there is no need to build or link
849	# the sqlite3.o object. Instead, the system SQLite will be linked
850	# using -lsqlite3.
851	SQLITE3_OBJ.1 =
	@@ -901,10 +898,11 @@
901	ifdef FOSSIL_BUILD_SSL
902	APPTARGETS += openssl
903	endif
904
905	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)

906	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
907
908	# This rule prevents make from using its default rules to try build
909	# an executable named "manifest" out of the file named "manifest.c"
910	#
	@@ -1051,12 +1049,13 @@
1051
1052	APPNAME = $(OBJDIR)\fossil$(E)
1053
1054	all: $(APPNAME)
1055
1056	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
1057	cd $(OBJDIR)

1058	$(DMDIR)\bin\link @link
1059
1060	$(OBJDIR)\fossil.res: $B\win\fossil.rc
1061	$(RC) $(RCFLAGS) -o$@ $**
1062
	@@ -1080,11 +1079,11 @@
1080	$(BCC) -o$@ $**
1081
1082	mkindex$E: $(SRCDIR)\mkindex.c
1083	$(BCC) -o$@ $**
1084
1085	version$E: $B\src\mkversion.c
1086	$(BCC) -o$@ $**
1087
1088	codecheck1$E: $(SRCDIR)\codecheck1.c
1089	$(BCC) -o$@ $**
1090
	@@ -1101,11 +1100,11 @@
1101	$(TCC) -o$@ -c $**
1102
1103	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1104	cp $@ $@
1105
1106	VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
1107	+$** > $@
1108
1109	page_index.h: mkindex$E $(SRC)
1110	+$** > $@
1111
	@@ -1415,12 +1414,13 @@
1415	!ifdef FOSSIL_BUILD_SSL
1416	APPTARGETS = $(APPTARGETS) openssl
1417	!endif
1418	!endif
1419
1420	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
1421	cd $(OX)

1422	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1423
1424	$(OX)\linkopts: $B\win\Makefile.msc}
1425	set redir {>}
1426	foreach s [lsort [concat $src $AdditionalObj]] {
	@@ -1443,11 +1443,11 @@
1443	$(BCC) $**
1444
1445	mkindex$E: $(SRCDIR)\mkindex.c
1446	$(BCC) $**
1447
1448	mkversion$E: $B\src\mkversion.c
1449	$(BCC) $**
1450
1451	codecheck1$E: $(SRCDIR)\codecheck1.c
1452	$(BCC) $**
1453
1454

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -785,11 +785,11 @@
785	endif}
786
787	writeln {
788	all: $(OBJDIR) $(APPNAME)
789
790	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
791	ifdef USE_WINDOWS
792	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
793	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
794	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
795	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -839,13 +839,10 @@
839	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
840
841	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
842	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
843



844	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
845	# to 1. If it is set to 1, then there is no need to build or link
846	# the sqlite3.o object. Instead, the system SQLite will be linked
847	# using -lsqlite3.
848	SQLITE3_OBJ.1 =
	@@ -901,10 +898,11 @@
898	ifdef FOSSIL_BUILD_SSL
899	APPTARGETS += openssl
900	endif
901
902	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
903	$(CODECHECK1) $(TRANS_SRC)
904	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
905
906	# This rule prevents make from using its default rules to try build
907	# an executable named "manifest" out of the file named "manifest.c"
908	#
	@@ -1051,12 +1049,13 @@
1049
1050	APPNAME = $(OBJDIR)\fossil$(E)
1051
1052	all: $(APPNAME)
1053
1054	$(APPNAME) : translate$E mkindex$E codecheck1$E headers $(OBJ) $(OBJDIR)\link
1055	cd $(OBJDIR)
1056	codecheck1$E $(SRC)
1057	$(DMDIR)\bin\link @link
1058
1059	$(OBJDIR)\fossil.res: $B\win\fossil.rc
1060	$(RC) $(RCFLAGS) -o$@ $**
1061
	@@ -1080,11 +1079,11 @@
1079	$(BCC) -o$@ $**
1080
1081	mkindex$E: $(SRCDIR)\mkindex.c
1082	$(BCC) -o$@ $**
1083
1084	mkversion$E: $(SRCDIR)\mkversion.c
1085	$(BCC) -o$@ $**
1086
1087	codecheck1$E: $(SRCDIR)\codecheck1.c
1088	$(BCC) -o$@ $**
1089
	@@ -1101,11 +1100,11 @@
1100	$(TCC) -o$@ -c $**
1101
1102	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
1103	cp $@ $@
1104
1105	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1106	+$** > $@
1107
1108	page_index.h: mkindex$E $(SRC)
1109	+$** > $@
1110
	@@ -1415,12 +1414,13 @@
1414	!ifdef FOSSIL_BUILD_SSL
1415	APPTARGETS = $(APPTARGETS) openssl
1416	!endif
1417	!endif
1418
1419	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts
1420	cd $(OX)
1421	codecheck1$E $(SRC)
1422	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1423
1424	$(OX)\linkopts: $B\win\Makefile.msc}
1425	set redir {>}
1426	foreach s [lsort [concat $src $AdditionalObj]] {
	@@ -1443,11 +1443,11 @@
1443	$(BCC) $**
1444
1445	mkindex$E: $(SRCDIR)\mkindex.c
1446	$(BCC) $**
1447
1448	mkversion$E: $(SRCDIR)\mkversion.c
1449	$(BCC) $**
1450
1451	codecheck1$E: $(SRCDIR)\codecheck1.c
1452	$(BCC) $**
1453
1454

M win/Makefile.dmc

+4 -3

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -40,12 +40,13 @@
40	40
41	41	APPNAME = $(OBJDIR)\fossil$(E)
42	42
43	43	all: $(APPNAME)
44	44
45		-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
	45	+$(APPNAME) : translate$E mkindex$E codecheck1$E headers $(OBJ) $(OBJDIR)\link
46	46	cd $(OBJDIR)
	47	+ codecheck1$E $(SRC)
47	48	$(DMDIR)\bin\link @link
48	49
49	50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
50	51	$(RC) $(RCFLAGS) -o$@ $**
51	52
		@@ -64,11 +65,11 @@
64	65	$(BCC) -o$@ $**
65	66
66	67	mkindex$E: $(SRCDIR)\mkindex.c
67	68	$(BCC) -o$@ $**
68	69
69		-version$E: $B\src\mkversion.c
	70	+mkversion$E: $(SRCDIR)\mkversion.c
70	71	$(BCC) -o$@ $**
71	72
72	73	codecheck1$E: $(SRCDIR)\codecheck1.c
73	74	$(BCC) -o$@ $**
74	75
		@@ -85,11 +86,11 @@
85	86	$(TCC) -o$@ -c $**
86	87
87	88	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
88	89	cp $@ $@
89	90
90		-VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
	91	+VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
91	92	+$** > $@
92	93
93	94	page_index.h: mkindex$E $(SRC)
94	95	+$** > $@
95	96
96	97

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -40,12 +40,13 @@
40
41	APPNAME = $(OBJDIR)\fossil$(E)
42
43	all: $(APPNAME)
44
45	$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OBJDIR)\link
46	cd $(OBJDIR)

47	$(DMDIR)\bin\link @link
48
49	$(OBJDIR)\fossil.res: $B\win\fossil.rc
50	$(RC) $(RCFLAGS) -o$@ $**
51
	@@ -64,11 +65,11 @@
64	$(BCC) -o$@ $**
65
66	mkindex$E: $(SRCDIR)\mkindex.c
67	$(BCC) -o$@ $**
68
69	version$E: $B\src\mkversion.c
70	$(BCC) -o$@ $**
71
72	codecheck1$E: $(SRCDIR)\codecheck1.c
73	$(BCC) -o$@ $**
74
	@@ -85,11 +86,11 @@
85	$(TCC) -o$@ -c $**
86
87	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
88	cp $@ $@
89
90	VERSION.h : version$E $B\manifest.uuid $B\manifest $B\VERSION
91	+$** > $@
92
93	page_index.h: mkindex$E $(SRC)
94	+$** > $@
95
96

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -40,12 +40,13 @@
40
41	APPNAME = $(OBJDIR)\fossil$(E)
42
43	all: $(APPNAME)
44
45	$(APPNAME) : translate$E mkindex$E codecheck1$E headers $(OBJ) $(OBJDIR)\link
46	cd $(OBJDIR)
47	codecheck1$E $(SRC)
48	$(DMDIR)\bin\link @link
49
50	$(OBJDIR)\fossil.res: $B\win\fossil.rc
51	$(RC) $(RCFLAGS) -o$@ $**
52
	@@ -64,11 +65,11 @@
65	$(BCC) -o$@ $**
66
67	mkindex$E: $(SRCDIR)\mkindex.c
68	$(BCC) -o$@ $**
69
70	mkversion$E: $(SRCDIR)\mkversion.c
71	$(BCC) -o$@ $**
72
73	codecheck1$E: $(SRCDIR)\codecheck1.c
74	$(BCC) -o$@ $**
75
	@@ -85,11 +86,11 @@
86	$(TCC) -o$@ -c $**
87
88	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR)\cson_amalgamation.h
89	cp $@ $@
90
91	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
92	+$** > $@
93
94	page_index.h: mkindex$E $(SRC)
95	+$** > $@
96
97

M win/Makefile.mingw

+2 -4

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -710,11 +710,11 @@
710	710	RMDIR = rm -rf
711	711	endif
712	712
713	713	all: $(OBJDIR) $(APPNAME)
714	714
715		-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
	715	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
716	716	ifdef USE_WINDOWS
717	717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
		@@ -764,13 +764,10 @@
764	764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765	765
766	766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768	768
769		-$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770		- $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771		-
772	769	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
773	770	# to 1. If it is set to 1, then there is no need to build or link
774	771	# the sqlite3.o object. Instead, the system SQLite will be linked
775	772	# using -lsqlite3.
776	773	SQLITE3_OBJ.1 =
		@@ -824,10 +821,11 @@
824	821	ifdef FOSSIL_BUILD_SSL
825	822	APPTARGETS += openssl
826	823	endif
827	824
828	825	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
	826	+ $(CODECHECK1) $(TRANS_SRC)
829	827	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
830	828
831	829	# This rule prevents make from using its default rules to try build
832	830	# an executable named "manifest" out of the file named "manifest.c"
833	831	#
834	832

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -710,11 +710,11 @@
710	RMDIR = rm -rf
711	endif
712
713	all: $(OBJDIR) $(APPNAME)
714
715	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
716	ifdef USE_WINDOWS
717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -764,13 +764,10 @@
764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765
766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768
769	$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770	$(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771
772	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
773	# to 1. If it is set to 1, then there is no need to build or link
774	# the sqlite3.o object. Instead, the system SQLite will be linked
775	# using -lsqlite3.
776	SQLITE3_OBJ.1 =
	@@ -824,10 +821,11 @@
824	ifdef FOSSIL_BUILD_SSL
825	APPTARGETS += openssl
826	endif
827
828	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)

829	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
830
831	# This rule prevents make from using its default rules to try build
832	# an executable named "manifest" out of the file named "manifest.c"
833	#
834

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -710,11 +710,11 @@
710	RMDIR = rm -rf
711	endif
712
713	all: $(OBJDIR) $(APPNAME)
714
715	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
716	ifdef USE_WINDOWS
717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -764,13 +764,10 @@
764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765
766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768



769	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
770	# to 1. If it is set to 1, then there is no need to build or link
771	# the sqlite3.o object. Instead, the system SQLite will be linked
772	# using -lsqlite3.
773	SQLITE3_OBJ.1 =
	@@ -824,10 +821,11 @@
821	ifdef FOSSIL_BUILD_SSL
822	APPTARGETS += openssl
823	endif
824
825	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826	$(CODECHECK1) $(TRANS_SRC)
827	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829	# This rule prevents make from using its default rules to try build
830	# an executable named "manifest" out of the file named "manifest.c"
831	#
832

M win/Makefile.mingw.mistachkin

+2 -4

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -710,11 +710,11 @@
710	710	RMDIR = rm -rf
711	711	endif
712	712
713	713	all: $(OBJDIR) $(APPNAME)
714	714
715		-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
	715	+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
716	716	ifdef USE_WINDOWS
717	717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
		@@ -764,13 +764,10 @@
764	764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765	765
766	766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768	768
769		-$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770		- $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771		-
772	769	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
773	770	# to 1. If it is set to 1, then there is no need to build or link
774	771	# the sqlite3.o object. Instead, the system SQLite will be linked
775	772	# using -lsqlite3.
776	773	SQLITE3_OBJ.1 =
		@@ -824,10 +821,11 @@
824	821	ifdef FOSSIL_BUILD_SSL
825	822	APPTARGETS += openssl
826	823	endif
827	824
828	825	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
	826	+ $(CODECHECK1) $(TRANS_SRC)
829	827	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
830	828
831	829	# This rule prevents make from using its default rules to try build
832	830	# an executable named "manifest" out of the file named "manifest.c"
833	831	#
834	832

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -710,11 +710,11 @@
710	RMDIR = rm -rf
711	endif
712
713	all: $(OBJDIR) $(APPNAME)
714
715	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
716	ifdef USE_WINDOWS
717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -764,13 +764,10 @@
764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765
766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768
769	$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770	$(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771
772	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
773	# to 1. If it is set to 1, then there is no need to build or link
774	# the sqlite3.o object. Instead, the system SQLite will be linked
775	# using -lsqlite3.
776	SQLITE3_OBJ.1 =
	@@ -824,10 +821,11 @@
824	ifdef FOSSIL_BUILD_SSL
825	APPTARGETS += openssl
826	endif
827
828	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)

829	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
830
831	# This rule prevents make from using its default rules to try build
832	# an executable named "manifest" out of the file named "manifest.c"
833	#
834

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -710,11 +710,11 @@
710	RMDIR = rm -rf
711	endif
712
713	all: $(OBJDIR) $(APPNAME)
714
715	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
716	ifdef USE_WINDOWS
717	$(CAT) $(subst /,\,$(SRCDIR)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
	@@ -764,13 +764,10 @@
764	$(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765
766	$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767	$(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768



769	# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
770	# to 1. If it is set to 1, then there is no need to build or link
771	# the sqlite3.o object. Instead, the system SQLite will be linked
772	# using -lsqlite3.
773	SQLITE3_OBJ.1 =
	@@ -824,10 +821,11 @@
821	ifdef FOSSIL_BUILD_SSL
822	APPTARGETS += openssl
823	endif
824
825	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
826	$(CODECHECK1) $(TRANS_SRC)
827	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
828
829	# This rule prevents make from using its default rules to try build
830	# an executable named "manifest" out of the file named "manifest.c"
831	#
832

M win/Makefile.msc

+3 -2

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -469,12 +469,13 @@
469	469	!ifdef FOSSIL_BUILD_SSL
470	470	APPTARGETS = $(APPTARGETS) openssl
471	471	!endif
472	472	!endif
473	473
474		-$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
	474	+$(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts
475	475	cd $(OX)
	476	+ codecheck1$E $(SRC)
476	477	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
477	478
478	479	$(OX)\linkopts: $B\win\Makefile.msc
479	480	echo $(OX)\add.obj > $@
480	481	echo $(OX)\allrepo.obj >> $@
		@@ -608,11 +609,11 @@
608	609	$(BCC) $**
609	610
610	611	mkindex$E: $(SRCDIR)\mkindex.c
611	612	$(BCC) $**
612	613
613		-mkversion$E: $B\src\mkversion.c
	614	+mkversion$E: $(SRCDIR)\mkversion.c
614	615	$(BCC) $**
615	616
616	617	codecheck1$E: $(SRCDIR)\codecheck1.c
617	618	$(BCC) $**
618	619
619	620

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -469,12 +469,13 @@
469	!ifdef FOSSIL_BUILD_SSL
470	APPTARGETS = $(APPTARGETS) openssl
471	!endif
472	!endif
473
474	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E headers $(OBJ) $(OX)\linkopts
475	cd $(OX)

476	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
477
478	$(OX)\linkopts: $B\win\Makefile.msc
479	echo $(OX)\add.obj > $@
480	echo $(OX)\allrepo.obj >> $@
	@@ -608,11 +609,11 @@
608	$(BCC) $**
609
610	mkindex$E: $(SRCDIR)\mkindex.c
611	$(BCC) $**
612
613	mkversion$E: $B\src\mkversion.c
614	$(BCC) $**
615
616	codecheck1$E: $(SRCDIR)\codecheck1.c
617	$(BCC) $**
618
619

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -469,12 +469,13 @@
469	!ifdef FOSSIL_BUILD_SSL
470	APPTARGETS = $(APPTARGETS) openssl
471	!endif
472	!endif
473
474	$(APPNAME) : $(APPTARGETS) translate$E mkindex$E codecheck1$E headers $(OBJ) $(OX)\linkopts
475	cd $(OX)
476	codecheck1$E $(SRC)
477	link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
478
479	$(OX)\linkopts: $B\win\Makefile.msc
480	echo $(OX)\add.obj > $@
481	echo $(OX)\allrepo.obj >> $@
	@@ -608,11 +609,11 @@
609	$(BCC) $**
610
611	mkindex$E: $(SRCDIR)\mkindex.c
612	$(BCC) $**
613
614	mkversion$E: $(SRCDIR)\mkversion.c
615	$(BCC) $**
616
617	codecheck1$E: $(SRCDIR)\codecheck1.c
618	$(BCC) $**
619
620

Fossil SCM

Keyboard Shortcuts