diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:05:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:05:03 +0900 |
| commit | 40bc898103359e1c2013585b2e043f556c23e15b (patch) | |
| tree | f845b85230e9680225af92d3f73e4992502d4b77 | |
| parent | 30322f1727699009b3f88bfd4b12b550a1bb8fdb (diff) | |
| parent | 39bb86b4e51a209e2bca765eab50eaffae56e527 (diff) | |
| download | git-40bc898103359e1c2013585b2e043f556c23e15b.tar.gz | |
Merge branch 'js/mingw-full-version-in-resources' into maint
MinGW updates.
* js/mingw-full-version-in-resources:
mingw: include the full version information in the resources
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | git.rc | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -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. @@ -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 |