[x264-devel] [PATCH 1/2] version.sh: add resilience

[Sean McGovern]

On Wed, Sep 4, 2013 at 5:37 PM, BugMaster <BugMaster at narod.ru> wrote:

> On Wed, 4 Sep 2013 17:11:53 -0400, Sean McGovern wrote:
>
>
>
> > On Mon, Jun 17, 2013 at 10:12 AM, Sean McGovern <gseanmcg at gmail.com>
> wrote:
>
>
> > On Monday, June 17, 2013, Jason Garrett-Glaser <jason at x264.com> wrote:
> >> On Mon, Jun 17, 2013 at 6:50 AM, Sean McGovern <gseanmcg at gmail.com>
> wrote:
> >>>
> >>>
> >>> On Monday, June 17, 2013, Jason Garrett-Glaser <jason at x264.com> wrote:
> >>>> On Mon, Jun 17, 2013 at 12:42 AM, Sean McGovern <gseanmcg at gmail.com>
> >>>> wrote:
> >>>>> ---
> >>>>>  version.sh |   11 +++++++----
> >>>>>  1 file changed, 7 insertions(+), 4 deletions(-)
> >>>>
> >>>> Could you explain this?
> >>>>
> >>>> Jason
> >>>
> >>> Sorry, my bad.
> >>>
> >>> For projects that use tarsnaps of the x264 codebase (for example,
> >>> HandBrake), this script fails hard due to lack of .git folders.
> >>
> >> Yes, but what does the patch *do*?
> >>
> >> Jason
>
> > It generates a version number from git if and only if the .git folder is
> present.
>
> > -- Sean McG.
>
>
> > PING!
>
> > -- Sean McG.
>
> First, it didn't really failed before patch (at least for me) if .git
> wasn't present. The only side effect was:
> "fatal: Not a git repository (or any of the parent directories): .git"
> but version information was generated in x264_config.h
> But after this patch X264_VERSION wouldn't be generated at all if you
> don't have git installed but have .git directory. So compilation will
> fail until you remove .git directory.
>

OK, I will fix it to probe for git first. Thanks for spotting that.

-- Sean McG.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x264-devel/attachments/20130904/406c3419/attachment.html>