Skip to content

Commit 39bb86b

Browse files
dschogitster
dscho
authored and
gitster
committed
mingw: include the full version information in the resources
This fixes git-for-windows#723 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fc849d8 commit 39bb86b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
19151915

19161916
git.res: git.rc GIT-VERSION-FILE
19171917
$(QUIET_RC)$(RC) \
1918-
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
1918+
$(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
1919+
$(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \
19191920
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
19201921

19211922
# This makes sure we depend on the NO_PERL setting itself.

‎git.rc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
1 VERSIONINFO
2-
FILEVERSION MAJOR,MINOR,0,0
3-
PRODUCTVERSION MAJOR,MINOR,0,0
2+
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
3+
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
44
BEGIN
55
BLOCK "StringFileInfo"
66
BEGIN

0 commit comments

Comments
 (0)