diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-10-30 18:19:42 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-01 13:43:52 +0900 |
| commit | 39bb86b4e51a209e2bca765eab50eaffae56e527 (patch) | |
| tree | 718c1bb7dc1bc3bc45c8387a427391f27e43b294 | |
| parent | Git 2.14.3 (diff) | |
| download | tgif-39bb86b4e51a209e2bca765eab50eaffae56e527.tar.xz | |
mingw: include the full version information in the resources
This fixes https://github.com/git-for-windows/git/issues/723
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | git.rc | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -1915,7 +1915,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc GIT-VERSION-FILE $(QUIET_RC)$(RC) \ - $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ + $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \ + $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ # This makes sure we depend on the NO_PERL setting itself. @@ -1,6 +1,6 @@ 1 VERSIONINFO -FILEVERSION MAJOR,MINOR,0,0 -PRODUCTVERSION MAJOR,MINOR,0,0 +FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL +PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL BEGIN BLOCK "StringFileInfo" BEGIN |