diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 9f24c26..0000000 --- a/AUTHORS +++ /dev/null @@ -1,77 +0,0 @@ - Virt Viewer Authors - =================== - -The Virt Viewer application is maintained by - - Daniel P. Berrange (Original author) - Christophe Fergeau - Marc-André Lureau - Hans de Goede - Michal Privoznik - -With additional patches from: - - Atsushi SAKAI - Chris Lalancette - Dave Allan - Doug Goldstein - Guannan Ren - Guido G\374nther - Hans de Goede - Hiroyuki Kaguchi - Jiri Denemark - Pavel Raiskup - Richard W.M. Jones - Ronnie Sahlberg - Yann E. MORIN - Yonit Halperin - Zeeshan Ali (Khattak) - - ...send patches to get your name here... - -Translations have been provided by - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ...and more... - -For full translation credits see the header of the individual -files in the po/ directory. - --- End diff --git a/AUTHORS.in b/AUTHORS.in new file mode 100644 index 0000000..e5d7307 --- /dev/null +++ b/AUTHORS.in @@ -0,0 +1,21 @@ + Virt Viewer Authors + =================== + +The Virt Viewer application is maintained by + + Daniel P. Berrange (Original author) + Christophe Fergeau + Marc-André Lureau + Hans de Goede + Michal Privoznik + +With additional patches & translations from: + +#authorslist# + + ...send patches to get your name here... + +For full translation credits see the header of the individual +files in the po/ directory. + +-- End diff --git a/Makefile.am b/Makefile.am index 2407b1b..65a4de7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ EXTRA_DIST = \ build-aux/gitlog-to-changelog \ build-aux/useless-if-before-free \ build-aux/vc-list-files \ + AUTHORS.in \ $(NULL) DISTCLEAN_FILES = \ @@ -44,11 +45,11 @@ MAINTAINERCLEANFILES = \ $(srcdir)/m4/lt~obsolete.m4 \ $(NULL) -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. -.PHONY: gen-ChangeLog +.PHONY: gen-ChangeLog gen-AUTHORS gen-ChangeLog: if test -d .git || test -d ../.git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ @@ -57,6 +58,14 @@ gen-ChangeLog: mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi + if OS_WIN32 .PHONY: nsis nsis: diff --git a/autogen.sh b/autogen.sh index a850132..b8d3c4d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,6 +2,7 @@ # Run this to generate all the initial makefiles, etc. set -e + srcdir=`dirname $0` test -z "$srcdir" && srcdir=. @@ -21,6 +22,11 @@ if test "x$1" = "x--system"; then EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir" fi +# Real ChangeLog/AUTHORS is auto-generated from GIT logs at + # make dist time, but automake requires that it + # exists at all times :-( +touch ChangeLog AUTHORS + intltoolize --force autoreconf -vfi diff --git a/cfg.mk b/cfg.mk index 30392d4..fcba213 100644 --- a/cfg.mk +++ b/cfg.mk @@ -18,7 +18,6 @@ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ - check-AUTHORS \ makefile-check \ makefile_path_separator_check \ patch-check \ @@ -111,20 +110,6 @@ sc_copyright_format: # We don't use this feature of maint.mk. prev_version_file = /dev/null -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch] exclude_file_name_regexp--sc_prohibit_strcmp = ^*/*.[ch]