Re: [msysGit] [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Pat Thoyts
On 23 January 2014 07:28, Johannes Sixt j.s...@viscovery.net wrote: From: Johannes Sixt j...@kdbg.org If the git version number consists of less than three period separated numbers, then the Windows resource file compilation issues a syntax error: $ touch git.rc $ make V=1 git.res

Re: [msysGit] [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Johannes Sixt
Am 1/23/2014 13:02, schrieb Pat Thoyts: On 23 January 2014 07:28, Johannes Sixt j.s...@viscovery.net wrote: @@ -1773,7 +1773,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc GIT-VERSION-FILE $(QUIET_RC)$(RC) \ - $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist

Re: [msysGit] [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Pat Thoyts
On 23 January 2014 14:16, Johannes Sixt j.s...@viscovery.net wrote: Am 1/23/2014 13:02, schrieb Pat Thoyts: On 23 January 2014 07:28, Johannes Sixt j.s...@viscovery.net wrote: @@ -1773,7 +1773,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc GIT-VERSION-FILE

Re: [PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-23 Thread Junio C Hamano
Pat Thoyts pattho...@gmail.com writes: GIT_VERSION=1.9.rc0 all: echo $(join -DMAJOR= -DMINOR= -DPATCH=, \ $(wordlist 1,3,$(filter-out rc%,$(subst -, ,$(subst ., ,$(GIT_VERSION 0 0)) This removes any rc* parts and appends a couple of zeros so that all missing elements

[PATCH v2] Makefile: Fix compilation of Windows resource file

2014-01-22 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org If the git version number consists of less than three period separated numbers, then the Windows resource file compilation issues a syntax error: $ touch git.rc $ make V=1 git.res GIT_VERSION = 1.9.rc0 windres -O coff \ -DMAJOR=1 -DMINOR=9