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>
Johannes Schindelin committed
Oct 30, 2017 at 18:19 UTC
39bb86b4e51a209e2bca765eab50eaffae56e527
2 files changed
+4
-3
Makefile
+2
-1
@@ -1915,7 +1915,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
1915
1916
git.res: git.rc GIT-VERSION-FILE
1917
$(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-' ' '))) \
1920
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
1921
1922
# This makes sure we depend on the NO_PERL setting itself.
git.rc
+2
-2
@@ -1,6 +1,6 @@
1
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
4
BEGIN
5
BLOCK "StringFileInfo"
6
BEGIN