Fossil SCM

Always regenerate the VERSION.h file, and hence change the FOSSIL_BUILD_HASH value, every time "make" is run.

drh 2020-07-31 14:20 trunk
Commit 01c03ca16a3b993e2d1a0ef6ea01a67e08908b0ccbc7e395538e3d6b826a532b
Parent ef38f0d7cab51d3…
4 files changed +4 -1 +13 -4 +4 -1 +5 -2
~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.msc
M src/main.mk
+4 -1
--- src/main.mk
+++ src/main.mk
@@ -598,13 +598,16 @@
598598
 # the run to just those test cases.
599599
 #
600600
 test: $(OBJDIR) $(APPNAME)
601601
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
602602
603
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
603
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
604604
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
605605
606
+$(OBJDIR)/phony.h:
607
+ # Force rebuild of VERSION.h every time we run "make"
608
+
606609
 # Setup the options used to compile the included SQLite library.
607610
 SQLITE_OPTIONS = -DNDEBUG=1 \
608611
 -DSQLITE_DQS=0 \
609612
 -DSQLITE_THREADSAFE=0 \
610613
 -DSQLITE_DEFAULT_MEMSTATUS=0 \
611614
--- src/main.mk
+++ src/main.mk
@@ -598,13 +598,16 @@
598 # the run to just those test cases.
599 #
600 test: $(OBJDIR) $(APPNAME)
601 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
602
603 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
604 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
605
 
 
 
606 # Setup the options used to compile the included SQLite library.
607 SQLITE_OPTIONS = -DNDEBUG=1 \
608 -DSQLITE_DQS=0 \
609 -DSQLITE_THREADSAFE=0 \
610 -DSQLITE_DEFAULT_MEMSTATUS=0 \
611
--- src/main.mk
+++ src/main.mk
@@ -598,13 +598,16 @@
598 # the run to just those test cases.
599 #
600 test: $(OBJDIR) $(APPNAME)
601 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
602
603 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
604 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
605
606 $(OBJDIR)/phony.h:
607 # Force rebuild of VERSION.h every time we run "make"
608
609 # Setup the options used to compile the included SQLite library.
610 SQLITE_OPTIONS = -DNDEBUG=1 \
611 -DSQLITE_DQS=0 \
612 -DSQLITE_THREADSAFE=0 \
613 -DSQLITE_DEFAULT_MEMSTATUS=0 \
614
M src/makemake.tcl
+13 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -370,15 +370,18 @@
370370
 # the run to just those test cases.
371371
 #
372372
 test: $(OBJDIR) $(APPNAME)
373373
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
374374
375
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
375
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
376376
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
377377
 $(SRCDIR)/../manifest \
378378
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379379
380
+$(OBJDIR)/phony.h:
381
+ # Force rebuild of VERSION.h every time we run "make"
382
+
380383
 # Setup the options used to compile the included SQLite library.
381384
 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
382385
383386
 # Setup the options used to compile the included SQLite shell.
384387
 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
@@ -1081,13 +1084,16 @@
10811084
 # build is done from, i.e. the checkout belongs to. Do not sync/push
10821085
 # the repository after running the tests.
10831086
 test: $(OBJDIR) $(APPNAME)
10841087
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
10851088
1086
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1089
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h
10871090
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
10881091
1092
+$(OBJDIR)/phony.h:
1093
+ # Force rebuild of VERSION.h every time "make" is run
1094
+
10891095
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
10901096
 # to 1. If it is set to 1, then there is no need to build or link
10911097
 # the sqlite3.o object. Instead, the system SQLite will be linked
10921098
 # using -lsqlite3.
10931099
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1907,12 +1913,15 @@
19071913
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
19081914
19091915
 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
19101916
 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
19111917
1912
-"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION"
1913
- $** > $@
1918
+"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1919
+ "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1920
+
1921
+"$(B)\phony.h" :
1922
+ rem Force rebuild of VERSION.h whenever nmake is run
19141923
19151924
 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
19161925
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
19171926
19181927
 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
19191928
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -370,15 +370,18 @@
370 # the run to just those test cases.
371 #
372 test: $(OBJDIR) $(APPNAME)
373 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
374
375 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
376 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
377 $(SRCDIR)/../manifest \
378 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
 
 
 
380 # Setup the options used to compile the included SQLite library.
381 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
382
383 # Setup the options used to compile the included SQLite shell.
384 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
@@ -1081,13 +1084,16 @@
1081 # build is done from, i.e. the checkout belongs to. Do not sync/push
1082 # the repository after running the tests.
1083 test: $(OBJDIR) $(APPNAME)
1084 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1085
1086 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1087 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1088
 
 
 
1089 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1090 # to 1. If it is set to 1, then there is no need to build or link
1091 # the sqlite3.o object. Instead, the system SQLite will be linked
1092 # using -lsqlite3.
1093 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1907,12 +1913,15 @@
1907 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1908
1909 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
1910 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1911
1912 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION"
1913 $** > $@
 
 
 
1914
1915 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1916 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1917
1918 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1919
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -370,15 +370,18 @@
370 # the run to just those test cases.
371 #
372 test: $(OBJDIR) $(APPNAME)
373 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
374
375 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
376 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
377 $(SRCDIR)/../manifest \
378 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
379
380 $(OBJDIR)/phony.h:
381 # Force rebuild of VERSION.h every time we run "make"
382
383 # Setup the options used to compile the included SQLite library.
384 SQLITE_OPTIONS = <<<SQLITE_OPTIONS>>>
385
386 # Setup the options used to compile the included SQLite shell.
387 SHELL_OPTIONS = <<<SHELL_OPTIONS>>>
@@ -1081,13 +1084,16 @@
1084 # build is done from, i.e. the checkout belongs to. Do not sync/push
1085 # the repository after running the tests.
1086 test: $(OBJDIR) $(APPNAME)
1087 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1088
1089 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h
1090 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1091
1092 $(OBJDIR)/phony.h:
1093 # Force rebuild of VERSION.h every time "make" is run
1094
1095 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1096 # to 1. If it is set to 1, then there is no need to build or link
1097 # the sqlite3.o object. Instead, the system SQLite will be linked
1098 # using -lsqlite3.
1099 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
@@ -1907,12 +1913,15 @@
1913 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1914
1915 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
1916 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1917
1918 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1919 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1920
1921 "$(B)\phony.h" :
1922 rem Force rebuild of VERSION.h whenever nmake is run
1923
1924 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1925 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1926
1927 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1928
M win/Makefile.mingw
+4 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1061,13 +1061,16 @@
10611061
 # build is done from, i.e. the checkout belongs to. Do not sync/push
10621062
 # the repository after running the tests.
10631063
 test: $(OBJDIR) $(APPNAME)
10641064
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
10651065
1066
-$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1066
+$(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h
10671067
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
10681068
1069
+$(OBJDIR)/phony.h:
1070
+ # Force rebuild of VERSION.h every time "make" is run
1071
+
10691072
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
10701073
 # to 1. If it is set to 1, then there is no need to build or link
10711074
 # the sqlite3.o object. Instead, the system SQLite will be linked
10721075
 # using -lsqlite3.
10731076
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
10741077
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1061,13 +1061,16 @@
1061 # build is done from, i.e. the checkout belongs to. Do not sync/push
1062 # the repository after running the tests.
1063 test: $(OBJDIR) $(APPNAME)
1064 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1065
1066 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION)
1067 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1068
 
 
 
1069 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1070 # to 1. If it is set to 1, then there is no need to build or link
1071 # the sqlite3.o object. Instead, the system SQLite will be linked
1072 # using -lsqlite3.
1073 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1074
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1061,13 +1061,16 @@
1061 # build is done from, i.e. the checkout belongs to. Do not sync/push
1062 # the repository after running the tests.
1063 test: $(OBJDIR) $(APPNAME)
1064 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
1065
1066 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(MKVERSION) $(OBJDIR)/phony.h
1067 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1068
1069 $(OBJDIR)/phony.h:
1070 # Force rebuild of VERSION.h every time "make" is run
1071
1072 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1073 # to 1. If it is set to 1, then there is no need to build or link
1074 # the sqlite3.o object. Instead, the system SQLite will be linked
1075 # using -lsqlite3.
1076 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1077
M win/Makefile.msc
+5 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1022,12 +1022,15 @@
10221022
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
10231023
10241024
 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
10251025
 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
10261026
1027
-"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION"
1028
- $** > $@
1027
+"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1028
+ "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1029
+
1030
+"$(B)\phony.h" :
1031
+ rem Force rebuild of VERSION.h whenever nmake is run
10291032
10301033
 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
10311034
 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
10321035
10331036
 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
10341037
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1022,12 +1022,15 @@
1022 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1023
1024 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
1025 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1026
1027 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION"
1028 $** > $@
 
 
 
1029
1030 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1031 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1032
1033 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1034
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -1022,12 +1022,15 @@
1022 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1023
1024 "$(OX)\miniz$O" : "$(SRCDIR)\miniz.c"
1025 $(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1026
1027 "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1028 "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1029
1030 "$(B)\phony.h" :
1031 rem Force rebuild of VERSION.h whenever nmake is run
1032
1033 "$(OX)\cson_amalgamation$O" : "$(SRCDIR)\cson_amalgamation.c"
1034 $(TCC) /Fo$@ /Fd$(@D)\ -c $**
1035
1036 "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1037

Keyboard Shortcuts

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