Fossil SCM

Add call to codecheck1 tool during the MinGW build process.

mistachkin 2014-10-20 20:13 UTC compile-time-print-checking
Commit 7c25045618eb242fc77b10a13a23bbf01fedbd29
Parent afc22726ef70d14…
3 files changed +4 -1 +4 -1 +4 -1
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+4 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -785,11 +785,11 @@
785785
 endif}
786786
787787
 writeln {
788788
 all: $(OBJDIR) $(APPNAME)
789789
790
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
790
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
791791
 ifdef USE_WINDOWS
792792
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
793793
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
794794
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
795795
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -839,10 +839,13 @@
839839
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
840840
841841
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
842842
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
843843
844
+$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
845
+ $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
846
+
844847
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
845848
 # to 1. If it is set to 1, then there is no need to build or link
846849
 # the sqlite3.o object. Instead, the system SQLite will be linked
847850
 # using -lsqlite3.
848851
 SQLITE3_OBJ.1 =
849852
--- 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,10 +839,13 @@
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 =
849
--- 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,10 +839,13 @@
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 =
852
M win/Makefile.mingw
+4 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -710,11 +710,11 @@
710710
 RMDIR = rm -rf
711711
 endif
712712
713713
 all: $(OBJDIR) $(APPNAME)
714714
715
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
715
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
716716
 ifdef USE_WINDOWS
717717
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718718
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719719
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720720
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -764,10 +764,13 @@
764764
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765765
766766
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767767
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768768
769
+$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770
+ $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771
+
769772
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
770773
 # to 1. If it is set to 1, then there is no need to build or link
771774
 # the sqlite3.o object. Instead, the system SQLite will be linked
772775
 # using -lsqlite3.
773776
 SQLITE3_OBJ.1 =
774777
--- 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,10 +764,13 @@
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 =
774
--- 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,10 +764,13 @@
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 =
777
M win/Makefile.mingw.mistachkin
+4 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -710,11 +710,11 @@
710710
 RMDIR = rm -rf
711711
 endif
712712
713713
 all: $(OBJDIR) $(APPNAME)
714714
715
-$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
715
+$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h $(OBJDIR)/CODECHECK.txt
716716
 ifdef USE_WINDOWS
717717
 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
718718
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
719719
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
720720
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
@@ -764,10 +764,13 @@
764764
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765765
766766
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767767
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768768
769
+$(OBJDIR)/CODECHECK.txt: $(TRANS_SRC) $(CODECHECK1)
770
+ $(CODECHECK1) $(TRANS_SRC) >$(OBJDIR)/CODECHECK.txt
771
+
769772
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
770773
 # to 1. If it is set to 1, then there is no need to build or link
771774
 # the sqlite3.o object. Instead, the system SQLite will be linked
772775
 # using -lsqlite3.
773776
 SQLITE3_OBJ.1 =
774777
--- 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,10 +764,13 @@
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 =
774
--- 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,10 +764,13 @@
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 =
777

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button