Merge lp:~ted/unity/generate-authors into lp:unity

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp:~ted/unity/generate-authors
Merge into: lp:unity
Diff against target: 65 lines (+26/-17)
3 files modified
AUTHORS (+1/-5)
ChangeLog (+1/-0)
Makefile.am (+24/-12)
To merge this branch: bzr merge lp:~ted/unity/generate-authors
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+37995@code.launchpad.net

This proposal has been superseded by a proposal from 2011-01-06.

Description of the change

I was looking in Unity and I noticed that it didn't have the AUTHORS generation code in Makefile.am. Also updated the ChangeLog generation code.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Obviously this isn't going to apply against trunk, but might be worth at least merge into 0.2 and I'll steal the code for trunk too :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2010-04-07 15:23:07 +0000
3+++ AUTHORS 2010-10-08 17:22:40 +0000
4@@ -1,5 +1,1 @@
5-Neil Jagdish Patel <neil.patel@canonical.com>
6-Gordon Allott <gord.allott@canonical.com>
7-Mirco "MacSlow" Müller <mirco.mueller@canonical.com>
8-Jay Taoko <jay.taoko@canonical.com>
9-Jason Smith <jason.smith@canonical.com>
10+# Generated by Makefile. Do not edit.
11
12=== modified file 'ChangeLog'
13--- ChangeLog 2009-10-15 10:40:35 +0000
14+++ ChangeLog 2010-10-08 17:22:40 +0000
15@@ -0,0 +1,1 @@
16+# Generated by Makefile. Do not edit.
17
18=== modified file 'Makefile.am'
19--- Makefile.am 2010-07-02 13:56:28 +0000
20+++ Makefile.am 2010-10-08 17:22:40 +0000
21@@ -7,20 +7,32 @@
22
23 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-mutter
24
25-# ChangeLog file created at distcheck time
26+# ChangeLog and AUTHORS files created at distcheck time
27 dist-hook:
28- @if test -d "$(srcdir)/.bzr"; \
29- then \
30- echo Creating ChangeLog && \
31- ( cd "$(top_srcdir)" && \
32- echo '# Generated by Makefile. Do not edit.'; echo; \
33- $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
34- && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
35- || (rm -f ChangeLog.tmp; \
36+ @if test -d "$(top_srcdir)/.bzr"; \
37+ then \
38+ echo Creating ChangeLog && \
39+ ( cd "$(top_srcdir)" && \
40+ echo '# Generated by Makefile. Do not edit.'; echo; \
41+ $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
42+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
43+ || (rm -f ChangeLog.tmp; \
44 echo Failed to generate ChangeLog >&2 ); \
45- else \
46- echo Failed to generate ChangeLog: not a branch >&2; \
47- fi
48+ else \
49+ echo Failed to generate ChangeLog: not a branch >&2; \
50+ fi
51+ @if test -d "$(top_srcdir)/.bzr"; \
52+ then \
53+ echo Creating AUTHORS && \
54+ ( cd "$(top_srcdir)" && \
55+ echo '# Generated by Makefile. Do not edit.'; echo; \
56+ $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
57+ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
58+ || (rm -f AUTHORS.tmp; \
59+ echo Failed to generate AUTHORS >&2 ); \
60+ else \
61+ echo Failed to generate AUTHORS: not a branch >&2; \
62+ fi
63
64 pkgconfigdir = $(libdir)/pkgconfig
65 pkgconfig_DATA = unity.pc