summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-09 14:31:31 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-09 14:31:31 +0900
commitd3e32dc90c800ef35a7e5f52906a0bedae2ae008 (patch)
tree1d3ad69773338afd4f8f09f1a6b0d06488374b05
parent906329f369e0899d619f53071f7364270f887947 (diff)
parent39bb86b4e51a209e2bca765eab50eaffae56e527 (diff)
downloadgit-d3e32dc90c800ef35a7e5f52906a0bedae2ae008.tar.gz
Merge branch 'js/mingw-full-version-in-resources'
MinGW updates. * js/mingw-full-version-in-resources: mingw: include the full version information in the resources
-rw-r--r--Makefile3
-rw-r--r--git.rc4
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cd75985991..ee9d5eb11e 100644
--- a/Makefile
+++ b/Makefile
@@ -1940,7 +1940,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.
diff --git a/git.rc b/git.rc
index 33aafb786c..49002e0d54 100644
--- a/git.rc
+++ b/git.rc
@@ -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