On 3 August 2011 11:28, Luca Bruno <[email protected]> wrote:
> Andreas Fritiofson scrisse:
>
>> > > make dist should use git2cl to genereate ChangeLog from git
>> > > history, populating the placeholder file in released tarball.
>
>> > Still not working for srcdir != builddir
>> >
>> > make[1]: Entering directory `/home/soliver/openocd/openocd-rel'
>> > if test -d ../openocd/.git -a \( ! -e openocd-0.5.0-dev/ChangeLog -o
>> > -w openocd-0.5.0-dev/ChangeLog \) ; then \
>> >                ../openocd/tools/git2cl/git2cl >
>> > openocd-0.5.0-dev/ChangeLog ; \
>> >        fi
>> > fatal: Not a git repository (or any of the parent directories): .git
>> >
>
>> Current directory needs to be $(srcdir) before running git2cl.
>
> I suspect this will get tricky, as $(distdir) is relative to
> $(builddir). It could be easier to directly feed git2cl with a pipe
> from `git log -- $(srcdir)`, as in the attached patch.
> Spen, can you please check if this is ok for you?
> Jean-Christophe, could you consider it for inclusion in
> 0.5.0 (if ACKed)?
>
> Ciao, Luca
>

Replaced the following line and working out of tree - not tested inline

        if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w
$(distdir)/ChangeLog \) ; then \
                git --git-dir $(srcdir)/.git log | 
$(srcdir)/tools/git2cl/git2cl >
$(distdir)/ChangeLog ; \
        fi

Cheers
Spen
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to