From: Junio C Hamano <gitster@pobox•com>
To: Johannes Sixt <j.sixt@viscovery•net>
Cc: Ramsay Jones <ramsay@ramsay1•demon.co.uk>,
GIT Mailing-list <git@vger•kernel.org>,
Pat Thoyts <patthoyts@users•sourceforge.net>
Subject: Re: [PATCH/RFC] Makefile: Fix compilation of windows resource file
Date: Wed, 22 Jan 2014 08:12:38 -0800 [thread overview]
Message-ID: <xmqq38kgyozt.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <52DF6B6C.4020708@viscovery.net> (Johannes Sixt's message of "Wed, 22 Jan 2014 07:55:40 +0100")
Johannes Sixt <j.sixt@viscovery•net> writes:
> [Cc Pat, who added git.rc]
>
> Am 1/22/2014 0:48, schrieb Junio C Hamano:
>> Ramsay Jones <ramsay@ramsay1•demon.co.uk> writes:
>>
>>>> Note that I am merely guessing that "short-digit" version numbers
>>>> are acceptable by now after seeing
>>>>
>>>> https://sourceware.org/ml/binutils/2012-07/msg00199.html
>>>
>>> Ah, nice find!
>>>
>>> I will test your patch (below) and let you know soon, but it looks
>>> good to me. (I can't test it tonight, unfortunately.)
>>
>> One thing to note is that I don't know why the existing code dropped
>> the fourth digit from the maintenance series.
>
> I don't know either. But it does not really matter. When there are 4
> digits in the FILEVERSION and PRODUCTVERSION statements, then the user
> does not see them as-are, but, for example, 1.8.1283 for
> FILEVERSION 1,8,5,3 (1283 = 5*256+3). Therefore, I think that there is
> no point in providing 4 numbers, and the patch below should be
> sufficient.
Would that work well when we do 1.9.1, the first maintenance/bugfix
release for 1.9?
> diff --git a/Makefile b/Makefile
> index b4af1e2..99b2b89 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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
> diff --git a/git.rc b/git.rc
> index bce6db9..33aafb7 100644
> --- a/git.rc
> +++ b/git.rc
> @@ -1,6 +1,6 @@
> 1 VERSIONINFO
> -FILEVERSION MAJOR,MINOR,PATCH,0
> -PRODUCTVERSION MAJOR,MINOR,PATCH,0
> +FILEVERSION MAJOR,MINOR,0,0
> +PRODUCTVERSION MAJOR,MINOR,0,0
> BEGIN
> BLOCK "StringFileInfo"
> BEGIN
next prev parent reply other threads:[~2014-01-22 16:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-20 20:22 [PATCH/RFC] Makefile: Fix compilation of windows resource file Ramsay Jones
2014-01-21 21:04 ` Junio C Hamano
2014-01-21 21:36 ` Junio C Hamano
2014-01-21 22:51 ` Ramsay Jones
2014-01-21 23:48 ` Junio C Hamano
2014-01-22 6:55 ` Johannes Sixt
2014-01-22 16:12 ` Junio C Hamano [this message]
2014-01-22 16:42 ` Johannes Sixt
2014-01-22 17:38 ` Junio C Hamano
2014-01-22 20:14 ` Junio C Hamano
2014-01-23 7:28 ` [PATCH v2] Makefile: Fix compilation of Windows " Johannes Sixt
2014-01-23 12:02 ` Pat Thoyts
2014-01-23 14:16 ` Johannes Sixt
2014-01-23 15:19 ` Pat Thoyts
2014-01-23 18:02 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq38kgyozt.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j.sixt@viscovery$(echo .)net \
--cc=patthoyts@users$(echo .)sourceforge.net \
--cc=ramsay@ramsay1$(echo .)demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox