diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-24 12:22:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-24 12:22:08 (GMT) |
| commit | c65fe541cc2c408ec080a298a3eed3c752a5975c (patch) | |
| tree | 9dd56ef4ec11e8cebc036c50825119a613a34450 | |
| parent | bb2edf53775d20639bf171c51667cea8e21cfcea (diff) | |
| parent | a4251af984f53f9ff453b5af612327f3c74bfdfc (diff) | |
| download | tcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.zip tcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.tar.gz tcl-c65fe541cc2c408ec080a298a3eed3c752a5975c.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | unix/Makefile.in | 9 | ||||
| -rw-r--r-- | win/Makefile.in | 11 | ||||
| -rw-r--r-- | win/gitmanifest.in | 1 | ||||
| -rw-r--r-- | win/makefile.vc | 7 |
4 files changed, 25 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 40b9c5a..6f2ea52 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1257,6 +1257,11 @@ tclAsync.o: $(GENERIC_DIR)/tclAsync.c tclBasic.o: $(GENERIC_DIR)/tclBasic.c $(COMPILEHDR) $(MATHHDRS) $(NREHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBasic.c +tclUuid.h: $(TOP_DIR)/manifest.uuid + echo "#define TCL_VERSION_UUID \\" >$@ + cat $(TOP_DIR)/manifest.uuid >>$@ + echo "" >>$@ + tclBinary.o: $(GENERIC_DIR)/tclBinary.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclBinary.c @@ -2226,8 +2231,8 @@ $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure cd $(MAC_OSX_DIR); autoheader; touch $@ $(TOP_DIR)/manifest.uuid: - printf "git." >$(TOP_DIR)/manifest.uuid - git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid + printf "git-" >$(TOP_DIR)/manifest.uuid + (cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || printf "unknown" >$(TOP_DIR)/manifest.uuid) dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in genstubs \ $(MAC_OSX_DIR)/configure $(TOP_DIR)/manifest.uuid dist-packages ${NATIVE_TCLSH} diff --git a/win/Makefile.in b/win/Makefile.in index d31f91c..4b6921c 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -577,7 +577,7 @@ ${TCL_LIB_FILE}: ${TCL_OBJS} @MAKE_LIB@ ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} @POST_MAKE_LIB@ -${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} +${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS} @MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS) $(COPY) tclsh.exe.manifest ${DDE_DLL_FILE}.manifest @@ -673,6 +673,15 @@ tclPkgConfig.${OBJEXT}: tclPkgConfig.c -DBUILD_tcl \ @DEPARG@ $(CC_OBJNAME) +$(TOP_DIR)/manifest.uuid: + printf "git-" >$(TOP_DIR)/manifest.uuid + (cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || printf "unknown" >$(TOP_DIR)/manifest.uuid) + +tclUuid.h: $(TOP_DIR)/manifest.uuid + echo "#define TCL_VERSION_UUID \\" >$@ + cat $(TOP_DIR)/manifest.uuid >>$@ + echo "" >>$@ + # The following objects are part of the stub library and should not be built # as DLL objects but none of the symbols should be exported diff --git a/win/gitmanifest.in b/win/gitmanifest.in new file mode 100644 index 0000000..3e7de84 --- /dev/null +++ b/win/gitmanifest.in @@ -0,0 +1 @@ +git-
\ No newline at end of file diff --git a/win/makefile.vc b/win/makefile.vc index b5bb1a0..70d7629 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -798,6 +798,13 @@ $(TMP_DIR)\tclMainW.obj: $(GENERICDIR)\tclMain.c $(cc32) $(pkgcflags) /DUNICODE /D_UNICODE \
-Fo$@ $?
+$(ROOT)\manifest.uuid:
+ copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid
+ git rev-parse HEAD >>$(ROOT)\manifest.uuid
+
+$(TMP_DIR)\tclUuid.h: $(ROOT)\manifest.uuid
+ copy $(WIN_DIR)\tclUuid.h.in+$(ROOT)\manifest.uuid $(TMP_DIR)\tclUuid.h
+
$(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
$(cc32) $(appcflags) -Fo$@ $?
|