Skip to content

Commit 7faecdd

Browse files
committed
fixup! mingw: include the full version information in the resources
The previous attempts to fix this were all piecemeal, let's just try to ignore everything that is not a digit. Yes, sure, v2.10.0-rc2.windows.1 gets the bogus patchlevel 2 (because of -rc2), but there is not really anything we can do about that, given that the .rc only allows to use four numbers to describe the version. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 35ebda5 commit 7faecdd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
18301830
ifeq (,$(findstring .windows.,$(GIT_VERSION)))
18311831
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) -DPATCHLEVEL=0
18321832
else
1833-
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION)))))))
1833+
RC_VERSION_DEFS = $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(shell echo $(GIT_VERSION) | tr '.a-zA-Z-' ' ')))
18341834
endif
18351835

18361836
git.res: git.rc GIT-VERSION-FILE GIT-PREFIX

0 commit comments

Comments
 (0)