Re: [PATCH v2] Makefile: Fix compilation of Windows resource file
- From
Pat Thoyts <patthoyts@gmail.com>
- Date
- Jan 23, 2014, 15:19 UTC
- Message-ID
- <CABNJ2GKA5PhzTfrhSCOTWtWAKMdT8+Sn6_Q54z=Dc0UVWgdmZQ@mail.gmail.com>
- In-Reply-To
- <52E1244E.4010503@viscovery.net>
On 23 January 2014 14:16, Johannes Sixt <j.sixt@viscovery.net> wrote:
Show 39 quoted lines
> Am 1/23/2014 13:02, schrieb Pat Thoyts: >> On 23 January 2014 07:28, Johannes Sixt <j.sixt@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 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ >>> + $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ >>> -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ >>> >>> ifndef NO_PERL >> >> This was put in as a response to >> https://github.com/msysgit/git/issues/5 where a request was made to be >> able to check the version without actually executing the file. > > If I understand the request correctly, it is about manual inspection. The > correct version string for this purpose is recorded via -DGIT_VERSION. > >> Given >> that the majority of versions has the same first two digits this >> becomes fairly useless without the patchlevel digit. So it would be >> preferable to try to maintain all three digits. The following should >> do this: >> >> 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 should appear as 0 in the final list. > > As Junio already pointed out, this records the wrong number in the 1.9 > track before 1.9.1 is out because the third position is the commit count, > not the patch level. > > -- Hannes
OK - I cehcked and you are right in that the GIT_VERSION value is the one showing up the properties dialog at least under Windows 7. As this is the most likely to be examined I agree that just taking the first two digits is the simplest fix here. So, fine by me then.
Acked-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Cheers, Pat.
-- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.