Fossil SCM

Updates to Windows makefiles.

mistachkin 2014-10-20 19:25 UTC compile-time-print-checking
Commit afc22726ef70d1411d392e2ef92dfb14417dd383
Parent 0237021d584bb46…
4 files changed +2 +1 +5 +1
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -759,10 +759,11 @@
759759
 ifdef USE_WINDOWS
760760
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
761761
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
762762
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
763763
 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
764
+CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
764765
 CAT = type
765766
 CP = copy
766767
 GREP = find
767768
 MV = copy
768769
 RM = del /Q
@@ -1495,10 +1496,11 @@
14951496
 -del makeheaders$E
14961497
 -del makeheaders$P
14971498
 -del mkversion$E
14981499
 -del mkversion$P
14991500
 -del codecheck1$E
1501
+ -del codecheck1$P
15001502
15011503
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
15021504
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
15031505
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
15041506
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
15051507
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -759,10 +759,11 @@
759 ifdef USE_WINDOWS
760 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
761 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
762 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
763 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
 
764 CAT = type
765 CP = copy
766 GREP = find
767 MV = copy
768 RM = del /Q
@@ -1495,10 +1496,11 @@
1495 -del makeheaders$E
1496 -del makeheaders$P
1497 -del mkversion$E
1498 -del mkversion$P
1499 -del codecheck1$E
 
1500
1501 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1502 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1503 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1504 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
1505
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -759,10 +759,11 @@
759 ifdef USE_WINDOWS
760 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
761 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
762 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
763 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
764 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
765 CAT = type
766 CP = copy
767 GREP = find
768 MV = copy
769 RM = del /Q
@@ -1495,10 +1496,11 @@
1496 -del makeheaders$E
1497 -del makeheaders$P
1498 -del mkversion$E
1499 -del mkversion$P
1500 -del codecheck1$E
1501 -del codecheck1$P
1502
1503 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
1504 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
1505 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
1506 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
1507
M win/Makefile.mingw
+1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -685,10 +685,11 @@
685685
 ifdef USE_WINDOWS
686686
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687687
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688688
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689689
 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690
+CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
690691
 CAT = type
691692
 CP = copy
692693
 GREP = find
693694
 MV = copy
694695
 RM = del /Q
695696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -685,10 +685,11 @@
685 ifdef USE_WINDOWS
686 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
 
690 CAT = type
691 CP = copy
692 GREP = find
693 MV = copy
694 RM = del /Q
695
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -685,10 +685,11 @@
685 ifdef USE_WINDOWS
686 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
691 CAT = type
692 CP = copy
693 GREP = find
694 MV = copy
695 RM = del /Q
696
M win/Makefile.mingw.mistachkin
+5
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -685,10 +685,11 @@
685685
 ifdef USE_WINDOWS
686686
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687687
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688688
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689689
 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690
+CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
690691
 CAT = type
691692
 CP = copy
692693
 GREP = find
693694
 MV = copy
694695
 RM = del /Q
@@ -697,10 +698,11 @@
697698
 else
698699
 TRANSLATE = $(OBJDIR)/translate.exe
699700
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
700701
 MKINDEX = $(OBJDIR)/mkindex.exe
701702
 VERSION = $(OBJDIR)/version.exe
703
+CODECHECK1 = $(OBJDIR)/codecheck1.exe
702704
 CAT = cat
703705
 CP = cp
704706
 GREP = grep
705707
 MV = mv
706708
 RM = rm -f
@@ -750,10 +752,13 @@
750752
 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
751753
752754
 $(VERSION): $(SRCDIR)/mkversion.c
753755
 $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
754756
757
+$(CODECHECK1): $(SRCDIR)/codecheck1.c
758
+ $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
759
+
755760
 # WARNING. DANGER. Running the test suite modifies the repository the
756761
 # build is done from, i.e. the checkout belongs to. Do not sync/push
757762
 # the repository after running the tests.
758763
 test: $(OBJDIR) $(APPNAME)
759764
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
760765
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -685,10 +685,11 @@
685 ifdef USE_WINDOWS
686 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
 
690 CAT = type
691 CP = copy
692 GREP = find
693 MV = copy
694 RM = del /Q
@@ -697,10 +698,11 @@
697 else
698 TRANSLATE = $(OBJDIR)/translate.exe
699 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
700 MKINDEX = $(OBJDIR)/mkindex.exe
701 VERSION = $(OBJDIR)/version.exe
 
702 CAT = cat
703 CP = cp
704 GREP = grep
705 MV = mv
706 RM = rm -f
@@ -750,10 +752,13 @@
750 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
751
752 $(VERSION): $(SRCDIR)/mkversion.c
753 $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
754
 
 
 
755 # WARNING. DANGER. Running the test suite modifies the repository the
756 # build is done from, i.e. the checkout belongs to. Do not sync/push
757 # the repository after running the tests.
758 test: $(OBJDIR) $(APPNAME)
759 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
760
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -685,10 +685,11 @@
685 ifdef USE_WINDOWS
686 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
690 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
691 CAT = type
692 CP = copy
693 GREP = find
694 MV = copy
695 RM = del /Q
@@ -697,10 +698,11 @@
698 else
699 TRANSLATE = $(OBJDIR)/translate.exe
700 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
701 MKINDEX = $(OBJDIR)/mkindex.exe
702 VERSION = $(OBJDIR)/version.exe
703 CODECHECK1 = $(OBJDIR)/codecheck1.exe
704 CAT = cat
705 CP = cp
706 GREP = grep
707 MV = mv
708 RM = rm -f
@@ -750,10 +752,13 @@
752 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
753
754 $(VERSION): $(SRCDIR)/mkversion.c
755 $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
756
757 $(CODECHECK1): $(SRCDIR)/codecheck1.c
758 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
759
760 # WARNING. DANGER. Running the test suite modifies the repository the
761 # build is done from, i.e. the checkout belongs to. Do not sync/push
762 # the repository after running the tests.
763 test: $(OBJDIR) $(APPNAME)
764 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765
M win/Makefile.msc
+1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -664,10 +664,11 @@
664664
 -del makeheaders$E
665665
 -del makeheaders$P
666666
 -del mkversion$E
667667
 -del mkversion$P
668668
 -del codecheck1$E
669
+ -del codecheck1$P
669670
670671
 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
671672
 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
672673
 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
673674
 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
674675
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -664,10 +664,11 @@
664 -del makeheaders$E
665 -del makeheaders$P
666 -del mkversion$E
667 -del mkversion$P
668 -del codecheck1$E
 
669
670 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
671 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
672 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
673 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
674
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -664,10 +664,11 @@
664 -del makeheaders$E
665 -del makeheaders$P
666 -del mkversion$E
667 -del mkversion$P
668 -del codecheck1$E
669 -del codecheck1$P
670
671 $(OBJDIR)\json$O : $(SRCDIR)\json_detail.h
672 $(OBJDIR)\json_artifact$O : $(SRCDIR)\json_detail.h
673 $(OBJDIR)\json_branch$O : $(SRCDIR)\json_detail.h
674 $(OBJDIR)\json_config$O : $(SRCDIR)\json_detail.h
675

Keyboard Shortcuts

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