dist: Autogenerate AUTHORS file

Per discussion at the Summer 2017 developers meeting, generate
the AUTHORS list at make dist time, rather than trying to
keep it up to date and merge on the branches by hand.  While
most of the data is generated from git, the organization list
was maintained by hand.  The general feeling at the meeting was
that the organization list was not adding value and there were
concrete cases where it involved much chasing by the RMs, so
it has been removed.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>

.gitignore

@@ -67,6 +67,7 @@ vc70.pdb
 .hg
 .hgignore_local
 stamp-h?
+AUTHORS
 
 ar-lib
 ylwrap

.mailmap

@@ -107,3 +107,5 @@ Alex Mikheev <alexm@mellanox.com> <alexm@mellanox.com>
 Thomas Naughton <naughtont@ornl.gov> <naughtont@ornl.gov>
 
 Geoffrey Paulsen <gpaulsen@us.ibm.com> <gpaulsen@users.noreply.github.com>
+
+Anandhi S Jayakumar <anandhi.s.jayakumar@intel.com>

AUTHORS

@@ -1,362 +0,0 @@
-Open MPI Authors
-================
-
-The following cumulative list contains the names and email addresses
-of all individuals who have committed code to the Open MPI repository
-(either directly or through a third party, such as through a
-Github.com pull request).  Note that these email addresses are not
-guaranteed to be current; they are simply a unique indicator of the
-individual who committed them.
-
-
-Abhishek Joshi, Broadcom
-  abhishek.joshi@broadcom.com
-Abhishek Kulkarni, Indiana University
-  adkulkar@cs.indiana.edu
-Aboorva Devarajan, IBM
-  abodevar@in.ibm.com
-Adrian Knoth, Friedrich-Schiller-Universitat Jena
-  adi@minet.uni-jena.de
-Adrian Reber, Hochschule Esslingen
-  adrian@lisas.de
-Alejandro Vilches, Intel
-  alejandro.vilches@intel.com
-Aleksey Senin, Mellanox
-  alekseys@mellanox.com
-Alex Margolin, Mellanox
-  alex.margolin@mail.huji.ac.il
-Alex Mikheev, Mellanox
-  alexm@mellanox.com
-Alina Sklarevich, Mellanox
-  alinas@mellanox.com
-Anandhi S Jayakumar, Intel
-  anandhi.s.jayakumar@intel.com
-Andreas Knüpfer, Technische Universitaet Dresden
-  andreas.knuepfer@tu-dresden.de
-Andrew Friedley, Indiana University, Sandia National Laboratory, Intel
-  afriedle@osl.iu.edu
-  andrew.friedley@intel.com
-Andrew Lumsdaine, Indiana University
-  lums@cs.indiana.edu
-Annapurna Dasari, Intel
-  annapurna.dasari@intel.com
-Anya Tatashina, Sun
-  anya.tatashina@sun.com
-Artem Polyakov, Individual, Mellanox
-  artpol84@gmail.com
-Aurelien Bouteiller, University of Tennessee-Knoxville
-  bouteill@icl.utk.edu
-  darter4.nics.utk.edu
-Avneesh Pant, QLogic
-  avneesh.pant@qlogic.com
-Bert Wesarg, Technische Universitaet Dresden
-  bert.wesarg@tu-dresden.de
-Bill D'Amico, Cisco
-  bdamico@cisco.com
-Boris Karasev, Mellanox
-  karasev.b@gmail.com
-Brad Benton, IBM, AMD
-  brad.benton@us.ibm.com
-Brad Penoff, University of British Columbia
-  penoff@cs.ubc.ca
-Brian Barrett, Indiana University, Los Alamos National Laboratory, Sandia National Laboratory
-  brbarret@open-mpi.org
-Brice Goglin, INRIA
-  brice.goglin@inria.fr
-Camille Coti, University of Tennessee-Knoxville, INRIA
-  ccoti@icl.utk.edu
-Carlos Bederián, Individual
-  bc@famaf.unc.edu.ar
-Christian Bell, QLogic
-  christian.bell@qlogic.com
-Christoph Niethammer, High Performance Computing Center, Stuttgart
-  niethammer@hlrs.de
-Christopher Yeoh, IBM
-  cyeoh@au1.ibm.com
-Clement Foyer, INRIA
-  clement.foyer@inria.fr
-Craig E Rasmussen, Los Alamos National Laboratory, University of Oregon
-  rasmus@cas.uoregon.edu
-Dan Lacher, Sun
-  dan.lacher@sun.com
-Dave Goodell, Cisco
-  davidjgoodell@gmail.com
-  dgoodell@cisco.com
-David Daniel, Los Alamos National Laboratory
-  ddd@lanl.gov
-Denis Dimick, Los Alamos National Laboratory
-  dgdimick@lnal.gov
-Devendar Bureddy, Mellanox
-  devendar@mellanox.com
-Dimitar Pashov, Individual
-  d.pashov@gmail.com
-Donald Kerr, Sun, Oracle
-  donald.kerr@oracle.com
-Doron Shoham, Mellanox
-  dorons@mellanox.com
-Edgar Gabriel, High Performance Computing Center, Stuttgart, University of Tennessee-Knoxville, University of Houston
-  gabriel@cs.uh.edu
-Elena Elkina, Mellanox
-  elena.elkina89@gmail.com
-  elena.elkina@itseez.com
-Ethan Mallove, Sun, Oracle
-  ethan.mallove@oracle.com
-Eugene Loh, Sun, Oracle
-  eugene.loh@oracle.com
-Federico Reghenzani, Individual
-  federico1.reghenzani@mail.polimi.it
-Francois WELLENREITER, Individual
-  francois.wellenreiter@atos.net
-  wellen@free.fr
-Gabriel Pichot, Individual
-  gabriel.pichot@gmail.com
-Galen Shipman, Los Alamos National Laboratory
-  gshipman@lanl.gov
-Geoffrey Paulsen, IBM
-  gpaulsen@us.ibm.com
-George Bosilca, University of Tennessee-Knoxville
-  bosilca@eecs.utk.edu
-  bosilca@icl.utk.edu
-Gilles Gouaillardet, Research Organization for Information Science and Technology
-  gilles.gouaillardet@iferc.org
-  gilles@rist.or.jp
-Ginger Young, Los Alamos National Laboratory
-  gingery@lanl.gov
-Gleb Natapov, Voltaire
-  gleb@voltaire.com
-Gopal Santhanaraman, The Ohio State University
-  santhana@osu.edu
-Graham Fagg, University of Tennessee-Knoxville
-  gef@icl.utk.edu
-Greg Koenig, Oak Ridge National Laboratory
-  koenig@acm.org
-Greg Watson, Los Alamos National Laboratory
-  gwatson@lanl.gov
-Gregory M. Kurtzer, Lawrence Berkeley National Laboratory
-  gmkurtzer@lbl.gov
-Guillaume Papauré, Bull
-  guillaume.papaure@bull.net
-Hadi Montakhabi, University of Houston
-  hmontakhabi@uh.edu
-Howard Pritchard, Los Alamos National Laboratory
-  howardp@lanl.gov
-  hppritcha@gmail.com
-Iain Bason, Sun, Oracle
-  iain.bason@oracle.com
-Igor Ivanov, Mellanox
-  igor.ivanov.va@gmail.com
-  igor.ivanov@itseez.com
-Igor Usarov, Mellanox
-  igoru@mellanox.com
-Jeff Squyres, University of Indiana, Cisco
-  jeff@squyres.com
-  jsquyres@cisco.com
-Jelena Pjesivac-Grbovic, University of Tennessee-Knoxville
-  pjesa@icl.iu.edu
-Jijo Varghese, Individual
-  jijo733@gmail.com
-Jithin Jose, Intel
-  jithin.jose@intel.com
-John Westlund, Intel
-  john.a.westlund@intel.com
-Jon Mason, OpenGrid Computing
-  jdmason@opengridcomputing.com
-Jose Roman, Universitat Politecnica de Valencia
-  jroman@dsic.upv.es
-Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM
-  jhursey@us.ibm.com
-  jjhursey@open-mpi.org
-Joshua Gerrard, Individual
-  enquiries@joshuagerrard.com
-  joshuagerrard+ompi-commit@protonmail.com
-Joshua Ladd, Mellanox
-  jladd.mlnx@gmail.com
-  joshual@mellanox.com
-KAWASHIMA Takahiro, Fujistu
-  t-kawashima@jp.fujitsu.com
-Karen Norteman, Sun
-  karen.norteman@sun.com
-Karol Mroz, University of British Columbia
-  mroz.karol@gmail.com
-Kenneth Matney, Oak Ridge National Laboratory
-  matneykdsr@ornl.gov
-L. R. Rajeshnarayanan, Intel
-  l.r.rajeshnarayanan@intel.com
-LANL OMPI Bot, Los Alamos National Laboratory
-  openmpihpp@gmail.com
-Laura Casswell, Los Alamos National Laboratory
-  lcasswell@lanl.gov
-Lenny Verkhovsky, Voltaire
-  lennyb@voltaire.com
-Leobardo Ruiz Rountree, Individual
-  lruizrountree@gmail.com
-Li-Ta Lo, Los Alamos National Laboratory
-  ollie@lanl.gov
-MPI Team (bot), self
-  mpiteam@open-mpi.org
-Mangala Jyothi Bhaskar, University of Houston
-  mjbhaskar@crill.cs.uh.edu
-  mjbhaskar@salmon.cs.uh.edu
-  mjbhaskar@uh.edu
-Manjunath Gorentla Venkata, Oak Ridge National Laboratory
-  manjugv@ornl.gov
-Mark Allen, IBM
-  markalle@us.ibm.com
-Mark Santcroos, Rutgers University
-  m.a.santcroos@amc.uva.nl
-  mas781@scarletmail.rutgers.edu
-Mark Taylor, Los Alamos National Laboratory
-  mt@lanl.gov
-Martin Kontsek, Cisco
-  mkontsek@cisco.com
-Matias A Cabral, Intel
-  matias.a.cabral@intel.com
-Matthias Jurenz, Technische Universitaet Dresden
-  matthias.jurenz@tu-dresden.de
-Maximilien Levesque, Individual
-  maximilien.levesque@gmail.com
-Mike Dubman, Mellanox
-  miked@mellanox.com
-Mitch Sukalski, Sandia National Laboratory
-  mwsukal@ca.sandia.gov
-Mohamad Chaarawi, University of Houston
-  mschaara@cs.uh.edu
-Nadezhda Kogteva, Mellanox
-  nadezhda.kogteva@itseez.com
-  nadezhda@mngx-orion-01.dmz.e2e.mlnx
-Nadia Derbey, Bull
-  nadia.derbey@bull.net
-Nathan Hjelm, Los Alamos National Laboratory
-  hjelmn@cs.unm.edu
-  hjelmn@lanl.gov
-  hjelmn@me.com
-Nathaniel Graham, Los Alamos National Laboratory
-  ngraham@lanl.gov
-  nrgraham23@gmail.com
-Nick Papior Andersen, Individual
-  nickpapior@gmail.com
-Nicolas Chevalier, Bull
-  nicolas.chevalier@bull.net
-Nysal Jan K A, IBM
-  jnysal@gmail.com
-  jnysal@in.ibm.com
-Omri Mor
-  omri50@gmail.com
-Orion Poplawski, Individual
-  orion@cora.nwra.com
-Oscar Vega-Gisbert, Universitat Politecnica de Valencia
-  ovega@dsic.upv.es
-Pak Lui, Sun
-  pak.lui@sun.com
-Pascal Deveze, Bull
-  pascal.deveze@atos.net
-Patrick Geoffray, Myricom
-  patrick@myri.com
-Pavel Shamis, Mellanox, Oak Ridge National Laboratory
-  shamisp@ornl.gov
-Pierre Lemarinier, University of Tennessee-Knoxville
-  lemarini@icl.utk.edu
-Piotr Lesnicki, Bull
-  piotr.lesnicki@ext.bull.net
-Potnuri Bharat Teja, Chelsio
-  bharat@chelsio.com
-Prabhanjan Kambadur, Indiana University
-  pkambadu@osl.iu.edu
-Raghavendra Pendyala, Intel
-  raghavendra.p.pendyala@intel.com
-Rainer Keller, High Performance Computing Center, Stuttgart, Oak Ridge National Laboratory, Hochschule fuer Technik Stuttgart
-  rainer.keller@hft-stuttgart.de
-  rainer.keller@hlrs.de
-Ralph Castain, Los Alamos National Laboratory, Cisco, Greenplum, Intel
-  rhc@open-mpi.org
-Reese Faucette, Cisco
-  rfaucett@cisco.com
-Rich Graham, Los Alamos National Laboratory, Oak Ridge National Laboratory, Mellanox
-  richardg@mellanox.com
-Rob Awles, Los Alamos National Laboratory
-  rta@lanl.gov
-Rob Latham, Argonne National Laboratory
-  robl@mcs.anl.gov
-Rolf vandeVaart, Sun, Oracle, NVIDIA
-  rvandevaart@nvidia.com
-Ron Brightwell, Sandia National Laboratory
-  rbbrigh@sandia.gov
-Ryan Grant, Sandia National Laboratory
-  regrant233@gmail.com
-  regrant@sandia.gov
-Sameh S. Sharkawi, IBM
-  sssharka@us.ibm.com
-Sami Ayyorgun, Los Alamos National Laboratory
-  sami@lanl.gov
-Samuel Gutierrez, Los Alamos National Laboratory
-  samuel@lanl.gov
-Sayantan Sur, The Ohio State University
-  surs@osu.edu
-Sharon Melamed, Voltaire
-  sharonm@voltaire.com
-Shiqing Fan, High Performance Computing Center, Stuttgart
-  shiqing@hlrs.de
-Steve Wise, OpenGrid Computing
-  swise@opengridcomputing.com
-Sushant Sharma, Los Alamos National Laboratory
-  sushant@lanl.gov
-Sven Stork, High Performance Computing Center, Stuttgart
-  stork@hlrs.de
-Swen Boehm, Oak Ridge National Laboratory
-  sboehm@ornl.gov
-Sylvain Jeaugey, Bull, NVIDIA
-  sjeaugey@nvidia.com
-  sylvain.jeaugey@bull.net
-Teng Lin, Individual
-  teng.lin@gmail.com
-Terry Dontje, Sun, Oracle
-  terry.dontje@oracle.com
-Thananon Patinyasakdikul, Cisco, University of Tennessee-Knoxville
-  apatinya@cisco.com
-  tpatinya@utk.edu
-Thara Angskun, University of Tennessee-Knoxville
-  angskun@cs.utk.edu
-Thomas Herault, University of Tennessee-Knoxville
-  herault@icl.utk.edu
-Thomas Naughton, Oak Ridge National Laboratory
-  naughtont@ornl.gov
-Tim Mattox, Indiana University, Cisco, Individual
-  timothy.mattox@engilitycorp.com
-  tmattox@gmail.com
-Tim Prins, Indiana University, Los Alamos National Laboratory
-  tprins@lanl.gov
-Tim Woodall, Los Alamos National Laboratory
-  twoodall@lanl.gov
-Todd Kordenbrock, Sandia National Laboratory
-  thkgcode@gmail.com
-  thkorde@sandia.gov
-Tomislav Janjusic, Mellanox
-  tomislavj@mngx-apl-01.mtl.labs.mlnx
-Torsten Hoefler, Indiana University, Technische Universtaet Chemnitz
-  htor@osl.iu.edu
-Valentin Petrov, Mellanox
-  valentinp@mellanox.com
-Vasily Filipov, Mellanox
-  vasily@mellanox.com
-Vishal Sahay, Indiana University
-  vsahay@osl.iu.edu
-Vishwanath Venkatesan, University of Houston, Intel
-  vvenkates@gmail.com
-Weikuan Yu, Los Alamos National Laboratory
-  yuw@lanl.gov
-Wesley Bland, University of Tennessee-Knoxville
-  wbland@icl.utk.edu
-William Throwe, Individual
-  wtt6@cornell.edu
-Xin Zhao, Mellanox
-  xinz@mellanox.com
-Yael Dayan, Mellanox
-  yaeld@mellanox.com
-Yevgeny Kliteynik, Mellanox
-  kliteyn@mellanox.co.il
-Yohann Burette, Intel
-  yohann.burette@intel.com
-Yossi Itigin, Mellanox
-  yosefe@mellanox.com
-Zhi Ming Wang, IBM
-  wangzm@cn.ibm.com

Makefile.am

@@ -12,6 +12,8 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012-2015 Los Alamos National Security, Inc.  All rights reserved.
 # Copyright (c) 2014      Intel, Inc. All rights reserved.
+# Copyright (c) 2017      Amazon.com, Inc. or its affiliates.
+#                         All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -20,12 +22,16 @@
 #
 
 SUBDIRS = config contrib $(MCA_PROJECT_SUBDIRS) test
-EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl README.JAVA.txt
+EXTRA_DIST = README INSTALL VERSION Doxyfile LICENSE autogen.pl README.JAVA.txt AUTHORS
 
 include examples/Makefile.include
 
 dist-hook:
 	env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(OMPI_REPO_REV)"
+	@if test ! -s $(distdir)/AUTHORS ; then \
+		echo "AUTHORS file is empty; aborting distribution"; \
+		exit 1; \
+	fi
 
 # Check for common symbols.  Use a "-hook" to increase the odds that a
 # developer will see it at the end of their installation process.
@@ -39,3 +45,15 @@ install-exec-hook:
 	fi
 
 ACLOCAL_AMFLAGS = -I config
+
+# Use EXTRA_DIST and an explicit target (with a FORCE hack so that
+# it's always run) rather than a dist-hook because there's some magic
+# extra logic in Automake that will add AUTHORS to EXTRA_DIST if the
+# file exists when Automake is run.  Once we're explicit (to avoid odd
+# copy behavior), it's easier to always build AUTHORS here, rather
+# than trying to handle the EXTRA_DIST dependency from a clean repo
+# (no AUTHORS file present) and use dist-hook to run every time.
+AUTHORS: FORCE
+	$(PERL) "$(top_srcdir)/contrib/dist/make-authors.pl" --skip-ok --quiet --srcdir="$(top_srcdir)"
+
+FORCE:

contrib/Makefile.am

@@ -15,6 +15,8 @@
 # Copyright (c) 2013-2016 Los Alamos National Security, Inc.  All rights
 #                         reserved.
 # Copyright (c) 2013      Intel Corporation.  All rights reserved.
+# Copyright (c) 2017      Amazon.com, Inc. or its affiliates.
+#                         All Rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -35,6 +37,7 @@ EXTRA_DIST = \
         completion/mpirun.sh \
         completion/mpirun.zsh \
 	dist/make_dist_tarball \
+	dist/make-authors.pl \
 	dist/linux/openmpi.spec \
 	dist/mofed/compile_debian_mlnx_example.in \
 	dist/mofed/debian \

contrib/dist/make-authors.pl

@@ -1,161 +1,114 @@
 #!/usr/bin/env perl
 #
 # Copyright (c) 2008-2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2017      Amazon.com, Inc. or its affiliates.
+#                         All Rights reserved.
 #
 
 use strict;
 
 use Data::Dumper;
+use Getopt::Long;
+use Cwd;
 
 # Ensure that we're in the root of a writeable Git clone
 my $in_git_clone = 1;
+my $skip_ok = 0;
+my $quiet = 0;
+my $srcdir = ".";
+my $destdir = getcwd();
 
-$in_git_clone = 0
+GetOptions("skip-ok" => \$skip_ok,
-    if (! -d ".git" || ! -f "AUTHORS");
+	   "quiet" => \$quiet,
+	   "srcdir=s" => \$srcdir,
+	   "destdir=s" => \$destdir)
+    or die("Error in command line arguments\n");
+
+# we still work with git old enough to not have the -C option, and the
+# --git-dir option screws up .mailmap, so just jump into the source
+# directory and make life easier.
+chdir($srcdir);
+
+if (! -d ".git") {
+    if ($skip_ok == 0) {
+	print STDERR "I don't seem to be in a git repo :(\n";
+	exit(1);
+    } else {
+	# called from make dist, just exit quietly (for case where
+	# user runs "make dist" from a dist tarball)
+	exit(0);
+    }
+}
 
 ######################################################################
 
-my $header_sep = "-----";
-my $unknown_org = "********* NO ORGANIZATION SET ********";
-
 my $people;
 
 ######################################################################
 
 # Run git log to get a list of committers
 
-open (GIT, "git log --format=tformat:'%aN <%aE>'|") || die "Can't run 'git log'.";
+open (GIT, "git log --no-merges --format=tformat:'%aN <%aE>'|") || die "Can't run 'git log'.";
 while (<GIT>) {
     chomp;
     m/^\s*(.+)\s+<(.+)>\s*$/;
 
+    my $email = lc($2);
+
+    # special case from the SVN migration
+    if ($email eq 'no-author@open-mpi.org') { next; }
+    # skip the mpi bot...
+    if ($email eq 'mpiteam@open-mpi.org') { next; }
+
     if (!exists($people->{$1})) {
         # The person doesn't exist, so save a new entry
         $people->{$1} = {
             name => $1,
-            org => $unknown_org,
             emails => {
-                lc($2) => 1,
+                $email => 1,
             }
         };
 
-
+        if ($quiet == 0) { print STDOUT "Found Git committer: $1 <$email>\n"; }
-        print "Found Git committer: $1 <$2>\n";
     } else {
         # The person already exists, so just add (or overwrite) this
         # email address
-        $people->{$1}->{emails}->{$2} = 1;
+        $people->{$1}->{emails}->{$email} = 1;
     }
 }
 close(GIT);
 
-######################################################################
+if (scalar(keys(%{$people})) == 0) {
-
+    print STDERR "Found no author entries, assuming git broke.  Aborting!\n";
-# Read the existing AUTHORS file
+    exit(1);
-
-my $header;
-
-print "Matching Git emails to existing names/affiliations...\n";
-
-sub save {
-    my $current = shift;
-
-    print "Saving person from AUTHORS: $current->{name}\n";
-
-    # We may overwrite an entry written from the git log, but that's
-    # ok
-    $people->{$current->{name}} = $current;
 }
 
-open (AUTHORS, "AUTHORS") || die "Can't open AUTHORS file";
-my $in_header = 1;
-my $current = undef;
-while (<AUTHORS>) {
-    chomp;
-    my $line = $_;
-
-    # Slurp down header lines until we hit a line that begins with
-    # $header_sep
-    if ($in_header) {
-        $header .= "$line\n";
-
-        if ($_ =~ /^$header_sep/) {
-            $in_header = 0;
-
-            # There should be a blank line after this, too
-            $header .= "\n";
-        }
-        next;
-    }
-
-    # Skip blank lines
-    next
-        if ($line =~ /^\s*$/);
-
-    # Format of body:
-    #
-    # NAME, Affiliation 1[, Affiliation 2[...]]
-    #   Email address 1
-    #   [Email address 2]
-    #   [...]
-    # NAME, Affiliation 1[, Affiliation 2[...]]
-    #   Email address 1
-    #   [Email address 2]
-    #   [...]
-
-    # Found a new email address for an existing person
-    if ($line =~ /^  /) {
-        m/^  (.+)$/;
-        $current->{emails}->{lc($1)} = 1;
-
-        next;
-    } else {
-        # Found a new person; save the old entry
-        save($current)
-            if (defined($current));
-
-        $current = undef;
-        $current->{org} = $unknown_org;
-        if ($line =~ m/^(.+?),\s+(.+)$/) {
-            $current->{name} = $1;
-            $current->{org} = $2;
-        } else {
-            $current->{name} = $line;
-        }
-
-        next;
-    }
-}
-
-save($current)
-    if (defined($current));
-
-close(AUTHORS);
-
 ######################################################################
 
 # Output a new AUTHORS file
 
-open (AUTHORS, ">AUTHORS.new") || die "Can't write to AUTHORS file";
+open (AUTHORS, ">$destdir/AUTHORS") || die "Can't write to AUTHORS file";
 
+my $header = <<'END_HEADER';
+Open MPI Authors
+================
+
+The following cumulative list contains the names and email addresses
+of all individuals who have committed code to the Open MPI repository
+(either directly or through a third party, such as through a
+Github.com pull request).  Note that these email addresses are not
+guaranteed to be current; they are simply a unique indicator of the
+individual who committed them.
+
+
+END_HEADER
 print AUTHORS $header;
 
-my @people_with_unknown_orgs;
 my $email_dups;
 
 my @sorted_people = sort(keys(%{$people}));
 foreach my $p (@sorted_people) {
-    print AUTHORS $p;
+    print AUTHORS "$p\n";
-    if (exists($people->{$p}->{org})) {
-        my $org = $people->{$p}->{org};
-        if ($org ne $unknown_org) {
-            print AUTHORS ", $org";
-        } else {
-            # Record this so that we can warn about it
-            push(@people_with_unknown_orgs, $p);
-        }
-    }
-    print AUTHORS "\n";
 
     foreach my $e (sort(keys(%{$people->{$p}->{emails}}))) {
         # Sanity check: make sure this email address does not show up
@@ -191,38 +144,27 @@ foreach my $p (@sorted_people) {
 }
 close(AUTHORS);
 
-# We have a new AUTHORS file!  Replace the old one.
+print STDOUT "New AUTHORS file written.\n";
-unlink("AUTHORS");
-rename("AUTHORS.new", "AUTHORS");
-
-print "New AUTHORS file written.\n";
 
 ######################################################################
 
 # Output any relevant warnings
 
 my $warned = 0;
-if ($#people_with_unknown_orgs >= 0) {
-    $warned = 1;
-    print "\n*** WARNING: The following people have unspecified organiations:\n";
-    foreach my $p (@people_with_unknown_orgs) {
-        print "***   $p\n";
-    }
-}
 
 my @k = sort(keys(%{$email_dups}));
 if ($#k >= 0) {
     $warned = 1;
-    print "\n*** WARNING: The following people had the same email address:\n";
+    print STDERR "\n*** WARNING: The following people had the same email address:\n";
     foreach my $p (@k) {
-        print "***   $p, $email_dups->{$p}\n";
+        print STDERR "***   $p, $email_dups->{$p}\n";
     }
 }
 
 if ($warned) {
-    print "
+    print STDERR "
 *******************************************************************************
-*** YOU SHOULD EDIT THE .mailmap AND/OR AUTHORS FILE TO RESOLVE THESE WARNINGS!
+*** YOU SHOULD EDIT THE .mailmap FILE TO RESOLVE THESE WARNINGS!
 *******************************************************************************\n";
 }