Commit 39bb86b4 authored by Johannes Schindelin's avatar Johannes Schindelin Committed by Junio C Hamano

mingw: include the full version information in the resources

This fixes https://github.com/git-for-windows/git/issues/723Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent fc849d8d
...@@ -1915,7 +1915,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES ...@@ -1915,7 +1915,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
git.res: git.rc GIT-VERSION-FILE git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \ $(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 $@ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
# This makes sure we depend on the NO_PERL setting itself. # This makes sure we depend on the NO_PERL setting itself.
......
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION MAJOR,MINOR,0,0 FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
PRODUCTVERSION MAJOR,MINOR,0,0 PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment