Fossil SCM

For MinGW, avoid using the makefile macro name of 'VERSION'.

mistachkin 2014-10-28 04:03 trunk
Commit 0a4745d3d2a7c54875eb727408be04266c63459d
Parent 5247900ccfac0b5…
3 files changed +6 -6 +6 -6 +33 -7
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+6 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -788,11 +788,11 @@
788788
 ifdef USE_WINDOWS
789789
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
790790
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
791791
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
792792
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
793
-VERSION = $(subst /,\,$(OBJDIR)/version.exe)
793
+MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
794794
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
795795
 CAT = type
796796
 CP = copy
797797
 GREP = find
798798
 MV = copy
@@ -802,11 +802,11 @@
802802
 else
803803
 TRANSLATE = $(OBJDIR)/translate.exe
804804
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
805805
 MKINDEX = $(OBJDIR)/mkindex.exe
806806
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
807
-VERSION = $(OBJDIR)/version.exe
807
+MKVERSION = $(OBJDIR)/mkversion.exe
808808
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
809809
 CAT = cat
810810
 CP = cp
811811
 GREP = grep
812812
 MV = mv
@@ -858,12 +858,12 @@
858858
 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
859859
860860
 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
861861
 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
862862
863
-$(VERSION): $(SRCDIR)/mkversion.c
864
- $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
863
+$(MKVERSION): $(SRCDIR)/mkversion.c
864
+ $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
865865
866866
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
867867
 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
868868
869869
 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -870,12 +870,12 @@
870870
 # build is done from, i.e. the checkout belongs to. Do not sync/push
871871
 # the repository after running the tests.
872872
 test: $(OBJDIR) $(APPNAME)
873873
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
874874
875
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
876
- $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
875
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
876
+ $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
877877
878878
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
879879
 # to 1. If it is set to 1, then there is no need to build or link
880880
 # the sqlite3.o object. Instead, the system SQLite will be linked
881881
 # using -lsqlite3.
882882
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -788,11 +788,11 @@
788 ifdef USE_WINDOWS
789 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
790 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
791 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
792 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
793 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
794 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
795 CAT = type
796 CP = copy
797 GREP = find
798 MV = copy
@@ -802,11 +802,11 @@
802 else
803 TRANSLATE = $(OBJDIR)/translate.exe
804 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
805 MKINDEX = $(OBJDIR)/mkindex.exe
806 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
807 VERSION = $(OBJDIR)/version.exe
808 CODECHECK1 = $(OBJDIR)/codecheck1.exe
809 CAT = cat
810 CP = cp
811 GREP = grep
812 MV = mv
@@ -858,12 +858,12 @@
858 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
859
860 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
861 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
862
863 $(VERSION): $(SRCDIR)/mkversion.c
864 $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
865
866 $(CODECHECK1): $(SRCDIR)/codecheck1.c
867 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
868
869 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -870,12 +870,12 @@
870 # build is done from, i.e. the checkout belongs to. Do not sync/push
871 # the repository after running the tests.
872 test: $(OBJDIR) $(APPNAME)
873 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
874
875 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
876 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
877
878 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
879 # to 1. If it is set to 1, then there is no need to build or link
880 # the sqlite3.o object. Instead, the system SQLite will be linked
881 # using -lsqlite3.
882
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -788,11 +788,11 @@
788 ifdef USE_WINDOWS
789 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
790 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
791 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
792 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
793 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
794 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
795 CAT = type
796 CP = copy
797 GREP = find
798 MV = copy
@@ -802,11 +802,11 @@
802 else
803 TRANSLATE = $(OBJDIR)/translate.exe
804 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
805 MKINDEX = $(OBJDIR)/mkindex.exe
806 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
807 MKVERSION = $(OBJDIR)/mkversion.exe
808 CODECHECK1 = $(OBJDIR)/codecheck1.exe
809 CAT = cat
810 CP = cp
811 GREP = grep
812 MV = mv
@@ -858,12 +858,12 @@
858 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
859
860 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
861 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
862
863 $(MKVERSION): $(SRCDIR)/mkversion.c
864 $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
865
866 $(CODECHECK1): $(SRCDIR)/codecheck1.c
867 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
868
869 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -870,12 +870,12 @@
870 # build is done from, i.e. the checkout belongs to. Do not sync/push
871 # the repository after running the tests.
872 test: $(OBJDIR) $(APPNAME)
873 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
874
875 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
876 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
877
878 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
879 # to 1. If it is set to 1, then there is no need to build or link
880 # the sqlite3.o object. Instead, the system SQLite will be linked
881 # using -lsqlite3.
882
M win/Makefile.mingw
+6 -6
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -691,11 +691,11 @@
691691
 ifdef USE_WINDOWS
692692
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
693693
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
694694
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
695695
 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696
-VERSION = $(subst /,\,$(OBJDIR)/version.exe)
696
+MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
697697
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
698698
 CAT = type
699699
 CP = copy
700700
 GREP = find
701701
 MV = copy
@@ -705,11 +705,11 @@
705705
 else
706706
 TRANSLATE = $(OBJDIR)/translate.exe
707707
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
708708
 MKINDEX = $(OBJDIR)/mkindex.exe
709709
 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710
-VERSION = $(OBJDIR)/version.exe
710
+MKVERSION = $(OBJDIR)/mkversion.exe
711711
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
712712
 CAT = cat
713713
 CP = cp
714714
 GREP = grep
715715
 MV = mv
@@ -760,12 +760,12 @@
760760
 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
761761
762762
 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763763
 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764764
765
-$(VERSION): $(SRCDIR)/mkversion.c
766
- $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
765
+$(MKVERSION): $(SRCDIR)/mkversion.c
766
+ $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
767767
768768
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
769769
 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
770770
771771
 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -772,12 +772,12 @@
772772
 # build is done from, i.e. the checkout belongs to. Do not sync/push
773773
 # the repository after running the tests.
774774
 test: $(OBJDIR) $(APPNAME)
775775
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
776776
777
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
778
- $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
777
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
778
+ $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
779779
780780
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
781781
 # to 1. If it is set to 1, then there is no need to build or link
782782
 # the sqlite3.o object. Instead, the system SQLite will be linked
783783
 # using -lsqlite3.
784784
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -691,11 +691,11 @@
691 ifdef USE_WINDOWS
692 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
693 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
694 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
695 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696 VERSION = $(subst /,\,$(OBJDIR)/version.exe)
697 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
698 CAT = type
699 CP = copy
700 GREP = find
701 MV = copy
@@ -705,11 +705,11 @@
705 else
706 TRANSLATE = $(OBJDIR)/translate.exe
707 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
708 MKINDEX = $(OBJDIR)/mkindex.exe
709 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710 VERSION = $(OBJDIR)/version.exe
711 CODECHECK1 = $(OBJDIR)/codecheck1.exe
712 CAT = cat
713 CP = cp
714 GREP = grep
715 MV = mv
@@ -760,12 +760,12 @@
760 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
761
762 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764
765 $(VERSION): $(SRCDIR)/mkversion.c
766 $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
767
768 $(CODECHECK1): $(SRCDIR)/codecheck1.c
769 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
770
771 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -772,12 +772,12 @@
772 # build is done from, i.e. the checkout belongs to. Do not sync/push
773 # the repository after running the tests.
774 test: $(OBJDIR) $(APPNAME)
775 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
776
777 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
778 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
779
780 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
781 # to 1. If it is set to 1, then there is no need to build or link
782 # the sqlite3.o object. Instead, the system SQLite will be linked
783 # using -lsqlite3.
784
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -691,11 +691,11 @@
691 ifdef USE_WINDOWS
692 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
693 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
694 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
695 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
697 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
698 CAT = type
699 CP = copy
700 GREP = find
701 MV = copy
@@ -705,11 +705,11 @@
705 else
706 TRANSLATE = $(OBJDIR)/translate.exe
707 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
708 MKINDEX = $(OBJDIR)/mkindex.exe
709 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710 MKVERSION = $(OBJDIR)/mkversion.exe
711 CODECHECK1 = $(OBJDIR)/codecheck1.exe
712 CAT = cat
713 CP = cp
714 GREP = grep
715 MV = mv
@@ -760,12 +760,12 @@
760 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
761
762 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764
765 $(MKVERSION): $(SRCDIR)/mkversion.c
766 $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
767
768 $(CODECHECK1): $(SRCDIR)/codecheck1.c
769 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
770
771 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -772,12 +772,12 @@
772 # build is done from, i.e. the checkout belongs to. Do not sync/push
773 # the repository after running the tests.
774 test: $(OBJDIR) $(APPNAME)
775 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
776
777 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
778 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
779
780 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
781 # to 1. If it is set to 1, then there is no need to build or link
782 # the sqlite3.o object. Instead, the system SQLite will be linked
783 # using -lsqlite3.
784
M win/Makefile.mingw.mistachkin
+33 -7
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -339,10 +339,11 @@
339339
 $(SRCDIR)/bag.c \
340340
 $(SRCDIR)/bisect.c \
341341
 $(SRCDIR)/blob.c \
342342
 $(SRCDIR)/branch.c \
343343
 $(SRCDIR)/browse.c \
344
+ $(SRCDIR)/builtin.c \
344345
 $(SRCDIR)/cache.c \
345346
 $(SRCDIR)/captcha.c \
346347
 $(SRCDIR)/cgi.c \
347348
 $(SRCDIR)/checkin.c \
348349
 $(SRCDIR)/checkout.c \
@@ -443,19 +444,23 @@
443444
 $(SRCDIR)/wysiwyg.c \
444445
 $(SRCDIR)/xfer.c \
445446
 $(SRCDIR)/xfersetup.c \
446447
 $(SRCDIR)/zip.c
447448
449
+EXTRA_FILES = \
450
+ $(SRCDIR)/diff.tcl
451
+
448452
 TRANS_SRC = \
449453
 $(OBJDIR)/add_.c \
450454
 $(OBJDIR)/allrepo_.c \
451455
 $(OBJDIR)/attach_.c \
452456
 $(OBJDIR)/bag_.c \
453457
 $(OBJDIR)/bisect_.c \
454458
 $(OBJDIR)/blob_.c \
455459
 $(OBJDIR)/branch_.c \
456460
 $(OBJDIR)/browse_.c \
461
+ $(OBJDIR)/builtin_.c \
457462
 $(OBJDIR)/cache_.c \
458463
 $(OBJDIR)/captcha_.c \
459464
 $(OBJDIR)/cgi_.c \
460465
 $(OBJDIR)/checkin_.c \
461466
 $(OBJDIR)/checkout_.c \
@@ -565,10 +570,11 @@
565570
 $(OBJDIR)/bag.o \
566571
 $(OBJDIR)/bisect.o \
567572
 $(OBJDIR)/blob.o \
568573
 $(OBJDIR)/branch.o \
569574
 $(OBJDIR)/browse.o \
575
+ $(OBJDIR)/builtin.o \
570576
 $(OBJDIR)/cache.o \
571577
 $(OBJDIR)/captcha.o \
572578
 $(OBJDIR)/cgi.o \
573579
 $(OBJDIR)/checkin.o \
574580
 $(OBJDIR)/checkout.o \
@@ -684,11 +690,12 @@
684690
 #
685691
 ifdef USE_WINDOWS
686692
 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
687693
 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
688694
 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
689
-VERSION = $(subst /,\,$(OBJDIR)/version.exe)
695
+MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696
+MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
690697
 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
691698
 CAT = type
692699
 CP = copy
693700
 GREP = find
694701
 MV = copy
@@ -697,11 +704,12 @@
697704
 RMDIR = rmdir /S /Q
698705
 else
699706
 TRANSLATE = $(OBJDIR)/translate.exe
700707
 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
701708
 MKINDEX = $(OBJDIR)/mkindex.exe
702
-VERSION = $(OBJDIR)/version.exe
709
+MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710
+MKVERSION = $(OBJDIR)/mkversion.exe
703711
 CODECHECK1 = $(OBJDIR)/codecheck1.exe
704712
 CAT = cat
705713
 CP = cp
706714
 GREP = grep
707715
 MV = mv
@@ -749,12 +757,15 @@
749757
 $(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
750758
751759
 $(MKINDEX): $(SRCDIR)/mkindex.c
752760
 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
753761
754
-$(VERSION): $(SRCDIR)/mkversion.c
755
- $(BCC) -o $(VERSION) $(SRCDIR)/mkversion.c
762
+$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763
+ $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764
+
765
+$(MKVERSION): $(SRCDIR)/mkversion.c
766
+ $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
756767
757768
 $(CODECHECK1): $(SRCDIR)/codecheck1.c
758769
 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
759770
760771
 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -761,12 +772,12 @@
761772
 # build is done from, i.e. the checkout belongs to. Do not sync/push
762773
 # the repository after running the tests.
763774
 test: $(OBJDIR) $(APPNAME)
764775
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
765776
766
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
767
- $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
777
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
778
+ $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
768779
769780
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
770781
 # to 1. If it is set to 1, then there is no need to build or link
771782
 # the sqlite3.o object. Instead, the system SQLite will be linked
772783
 # using -lsqlite3.
@@ -848,19 +859,23 @@
848859
 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
849860
850861
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
851862
 $(MKINDEX) $(TRANS_SRC) >$@
852863
853
-$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
864
+$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
865
+ $(MKBUILTIN) $(EXTRA_FILES) >$@
866
+
867
+$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
854868
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
855869
 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
856870
 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
857871
 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
858872
 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
859873
 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
860874
 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
861875
 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
876
+ $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
862877
 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
863878
 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
864879
 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
865880
 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
866881
 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
@@ -969,10 +984,13 @@
969984
970985
 $(OBJDIR)/headers: Makefile
971986
972987
 Makefile:
973988
989
+$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990
+ $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
+
974992
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
975993
 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
976994
977995
 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
978996
 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
@@ -1032,10 +1050,18 @@
10321050
10331051
 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
10341052
 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
10351053
10361054
 $(OBJDIR)/browse.h: $(OBJDIR)/headers
1055
+
1056
+$(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(TRANSLATE)
1057
+ $(TRANSLATE) $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
1058
+
1059
+$(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
1060
+ $(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
1061
+
1062
+$(OBJDIR)/builtin.h: $(OBJDIR)/headers
10371063
10381064
 $(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
10391065
 $(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
10401066
10411067
 $(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
10421068
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -339,10 +339,11 @@
339 $(SRCDIR)/bag.c \
340 $(SRCDIR)/bisect.c \
341 $(SRCDIR)/blob.c \
342 $(SRCDIR)/branch.c \
343 $(SRCDIR)/browse.c \
 
344 $(SRCDIR)/cache.c \
345 $(SRCDIR)/captcha.c \
346 $(SRCDIR)/cgi.c \
347 $(SRCDIR)/checkin.c \
348 $(SRCDIR)/checkout.c \
@@ -443,19 +444,23 @@
443 $(SRCDIR)/wysiwyg.c \
444 $(SRCDIR)/xfer.c \
445 $(SRCDIR)/xfersetup.c \
446 $(SRCDIR)/zip.c
447
 
 
 
448 TRANS_SRC = \
449 $(OBJDIR)/add_.c \
450 $(OBJDIR)/allrepo_.c \
451 $(OBJDIR)/attach_.c \
452 $(OBJDIR)/bag_.c \
453 $(OBJDIR)/bisect_.c \
454 $(OBJDIR)/blob_.c \
455 $(OBJDIR)/branch_.c \
456 $(OBJDIR)/browse_.c \
 
457 $(OBJDIR)/cache_.c \
458 $(OBJDIR)/captcha_.c \
459 $(OBJDIR)/cgi_.c \
460 $(OBJDIR)/checkin_.c \
461 $(OBJDIR)/checkout_.c \
@@ -565,10 +570,11 @@
565 $(OBJDIR)/bag.o \
566 $(OBJDIR)/bisect.o \
567 $(OBJDIR)/blob.o \
568 $(OBJDIR)/branch.o \
569 $(OBJDIR)/browse.o \
 
570 $(OBJDIR)/cache.o \
571 $(OBJDIR)/captcha.o \
572 $(OBJDIR)/cgi.o \
573 $(OBJDIR)/checkin.o \
574 $(OBJDIR)/checkout.o \
@@ -684,11 +690,12 @@
684 #
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
@@ -697,11 +704,12 @@
697 RMDIR = rmdir /S /Q
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
@@ -749,12 +757,15 @@
749 $(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
750
751 $(MKINDEX): $(SRCDIR)/mkindex.c
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,12 +772,12 @@
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
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.
@@ -848,19 +859,23 @@
848 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
849
850 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
851 $(MKINDEX) $(TRANS_SRC) >$@
852
853 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
 
 
 
854 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
855 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
856 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
857 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
858 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
859 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
860 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
861 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
 
862 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
863 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
864 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
865 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
866 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
@@ -969,10 +984,13 @@
969
970 $(OBJDIR)/headers: Makefile
971
972 Makefile:
973
 
 
 
974 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
975 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
976
977 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
978 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
@@ -1032,10 +1050,18 @@
1032
1033 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
1034 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
1035
1036 $(OBJDIR)/browse.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1037
1038 $(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
1039 $(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
1040
1041 $(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
1042
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -339,10 +339,11 @@
339 $(SRCDIR)/bag.c \
340 $(SRCDIR)/bisect.c \
341 $(SRCDIR)/blob.c \
342 $(SRCDIR)/branch.c \
343 $(SRCDIR)/browse.c \
344 $(SRCDIR)/builtin.c \
345 $(SRCDIR)/cache.c \
346 $(SRCDIR)/captcha.c \
347 $(SRCDIR)/cgi.c \
348 $(SRCDIR)/checkin.c \
349 $(SRCDIR)/checkout.c \
@@ -443,19 +444,23 @@
444 $(SRCDIR)/wysiwyg.c \
445 $(SRCDIR)/xfer.c \
446 $(SRCDIR)/xfersetup.c \
447 $(SRCDIR)/zip.c
448
449 EXTRA_FILES = \
450 $(SRCDIR)/diff.tcl
451
452 TRANS_SRC = \
453 $(OBJDIR)/add_.c \
454 $(OBJDIR)/allrepo_.c \
455 $(OBJDIR)/attach_.c \
456 $(OBJDIR)/bag_.c \
457 $(OBJDIR)/bisect_.c \
458 $(OBJDIR)/blob_.c \
459 $(OBJDIR)/branch_.c \
460 $(OBJDIR)/browse_.c \
461 $(OBJDIR)/builtin_.c \
462 $(OBJDIR)/cache_.c \
463 $(OBJDIR)/captcha_.c \
464 $(OBJDIR)/cgi_.c \
465 $(OBJDIR)/checkin_.c \
466 $(OBJDIR)/checkout_.c \
@@ -565,10 +570,11 @@
570 $(OBJDIR)/bag.o \
571 $(OBJDIR)/bisect.o \
572 $(OBJDIR)/blob.o \
573 $(OBJDIR)/branch.o \
574 $(OBJDIR)/browse.o \
575 $(OBJDIR)/builtin.o \
576 $(OBJDIR)/cache.o \
577 $(OBJDIR)/captcha.o \
578 $(OBJDIR)/cgi.o \
579 $(OBJDIR)/checkin.o \
580 $(OBJDIR)/checkout.o \
@@ -684,11 +690,12 @@
690 #
691 ifdef USE_WINDOWS
692 TRANSLATE = $(subst /,\,$(OBJDIR)/translate.exe)
693 MAKEHEADERS = $(subst /,\,$(OBJDIR)/makeheaders.exe)
694 MKINDEX = $(subst /,\,$(OBJDIR)/mkindex.exe)
695 MKBUILTIN = $(subst /,\,$(OBJDIR)/mkbuiltin.exe)
696 MKVERSION = $(subst /,\,$(OBJDIR)/mkversion.exe)
697 CODECHECK1 = $(subst /,\,$(OBJDIR)/codecheck1.exe)
698 CAT = type
699 CP = copy
700 GREP = find
701 MV = copy
@@ -697,11 +704,12 @@
704 RMDIR = rmdir /S /Q
705 else
706 TRANSLATE = $(OBJDIR)/translate.exe
707 MAKEHEADERS = $(OBJDIR)/makeheaders.exe
708 MKINDEX = $(OBJDIR)/mkindex.exe
709 MKBUILTIN = $(OBJDIR)/mkbuiltin.exe
710 MKVERSION = $(OBJDIR)/mkversion.exe
711 CODECHECK1 = $(OBJDIR)/codecheck1.exe
712 CAT = cat
713 CP = cp
714 GREP = grep
715 MV = mv
@@ -749,12 +757,15 @@
757 $(BCC) -o $(MAKEHEADERS) $(SRCDIR)/makeheaders.c
758
759 $(MKINDEX): $(SRCDIR)/mkindex.c
760 $(BCC) -o $(MKINDEX) $(SRCDIR)/mkindex.c
761
762 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
763 $(BCC) -o $(MKBUILTIN) $(SRCDIR)/mkbuiltin.c
764
765 $(MKVERSION): $(SRCDIR)/mkversion.c
766 $(BCC) -o $(MKVERSION) $(SRCDIR)/mkversion.c
767
768 $(CODECHECK1): $(SRCDIR)/codecheck1.c
769 $(BCC) -o $(CODECHECK1) $(SRCDIR)/codecheck1.c
770
771 # WARNING. DANGER. Running the test suite modifies the repository the
@@ -761,12 +772,12 @@
772 # build is done from, i.e. the checkout belongs to. Do not sync/push
773 # the repository after running the tests.
774 test: $(OBJDIR) $(APPNAME)
775 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
776
777 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
778 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
779
780 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
781 # to 1. If it is set to 1, then there is no need to build or link
782 # the sqlite3.o object. Instead, the system SQLite will be linked
783 # using -lsqlite3.
@@ -848,19 +859,23 @@
859 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
860
861 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(MKINDEX)
862 $(MKINDEX) $(TRANS_SRC) >$@
863
864 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
865 $(MKBUILTIN) $(EXTRA_FILES) >$@
866
867 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
868 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
869 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
870 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
871 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
872 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
873 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
874 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
875 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
876 $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
877 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
878 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
879 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
880 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
881 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
@@ -969,10 +984,13 @@
984
985 $(OBJDIR)/headers: Makefile
986
987 Makefile:
988
989 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
990 $(MKBUILTIN) $(EXTRA_FILES) >$(OBJDIR)/builtin_data.h
991
992 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(TRANSLATE)
993 $(TRANSLATE) $(SRCDIR)/add.c >$(OBJDIR)/add_.c
994
995 $(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
996 $(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
@@ -1032,10 +1050,18 @@
1050
1051 $(OBJDIR)/browse.o: $(OBJDIR)/browse_.c $(OBJDIR)/browse.h $(SRCDIR)/config.h
1052 $(XTCC) -o $(OBJDIR)/browse.o -c $(OBJDIR)/browse_.c
1053
1054 $(OBJDIR)/browse.h: $(OBJDIR)/headers
1055
1056 $(OBJDIR)/builtin_.c: $(SRCDIR)/builtin.c $(TRANSLATE)
1057 $(TRANSLATE) $(SRCDIR)/builtin.c >$(OBJDIR)/builtin_.c
1058
1059 $(OBJDIR)/builtin.o: $(OBJDIR)/builtin_.c $(OBJDIR)/builtin.h $(OBJDIR)/builtin_data.h $(SRCDIR)/config.h
1060 $(XTCC) -o $(OBJDIR)/builtin.o -c $(OBJDIR)/builtin_.c
1061
1062 $(OBJDIR)/builtin.h: $(OBJDIR)/headers
1063
1064 $(OBJDIR)/cache_.c: $(SRCDIR)/cache.c $(TRANSLATE)
1065 $(TRANSLATE) $(SRCDIR)/cache.c >$(OBJDIR)/cache_.c
1066
1067 $(OBJDIR)/cache.o: $(OBJDIR)/cache_.c $(OBJDIR)/cache.h $(SRCDIR)/config.h
1068

Keyboard Shortcuts

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