Fossil SCM
Add generation of manifest.descr to Makefile.msc (via makemake.tcl); this can be removed after 'version --describe' support gets built in.
Commit
a198cde661ca13910b0376564ab060b7029e0c299feadcc9ed221615058695b0
Parent
4329553d517f7d1…
2 files changed
+3
+3
+3
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -1956,10 +1956,13 @@ | ||
| 1956 | 1956 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1957 | 1957 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1958 | 1958 | |
| 1959 | 1959 | "$(B)\phony.h" : |
| 1960 | 1960 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1961 | + | |
| 1962 | +"$(B)\manifest.descr" : | |
| 1963 | + type NUL >> $@ | |
| 1961 | 1964 | |
| 1962 | 1965 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1963 | 1966 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1964 | 1967 | |
| 1965 | 1968 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1966 | 1969 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -1956,10 +1956,13 @@ | |
| 1956 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1957 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1958 | |
| 1959 | "$(B)\phony.h" : |
| 1960 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1961 | |
| 1962 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1963 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1964 | |
| 1965 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1966 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -1956,10 +1956,13 @@ | |
| 1956 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1957 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1958 | |
| 1959 | "$(B)\phony.h" : |
| 1960 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1961 | |
| 1962 | "$(B)\manifest.descr" : |
| 1963 | type NUL >> $@ |
| 1964 | |
| 1965 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1966 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1967 | |
| 1968 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1969 |
+3
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -1067,10 +1067,13 @@ | ||
| 1067 | 1067 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1068 | 1068 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1069 | 1069 | |
| 1070 | 1070 | "$(B)\phony.h" : |
| 1071 | 1071 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1072 | + | |
| 1073 | +"$(B)\manifest.descr" : | |
| 1074 | + type NUL >> $@ | |
| 1072 | 1075 | |
| 1073 | 1076 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1074 | 1077 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1075 | 1078 | |
| 1076 | 1079 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1077 | 1080 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -1067,10 +1067,13 @@ | |
| 1067 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1068 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1069 | |
| 1070 | "$(B)\phony.h" : |
| 1071 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1072 | |
| 1073 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1074 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1075 | |
| 1076 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1077 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -1067,10 +1067,13 @@ | |
| 1067 | "$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" "$(B)\phony.h" |
| 1068 | "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\manifest.descr" > $@ |
| 1069 | |
| 1070 | "$(B)\phony.h" : |
| 1071 | rem Force rebuild of VERSION.h whenever nmake is run |
| 1072 | |
| 1073 | "$(B)\manifest.descr" : |
| 1074 | type NUL >> $@ |
| 1075 | |
| 1076 | "$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c" |
| 1077 | $(TCC) /Fo$@ /Fd$(@D)\ -c $** |
| 1078 | |
| 1079 | "$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC) |
| 1080 |