Skip to content

Commit

Permalink
Refactor authorship information for more technical accuracy.
Browse files Browse the repository at this point in the history
Google advises its employees to add Google Inc. as an author, but that hasn't
been done yet and would be super inconvenient. So instead I've refactored the
file to refer to "The JsonCpp Authors", which are listed in the AUTHORS file.

The AUTHORS file itself is generated via:

    git log --pretty="%an <%ae>%n%cn <%ce>" | sort | uniq

Plus the addition of "Google Inc." as a copyright author. (Google owns the work
of anyone contributing from an @google.com address, for example.)

The list contains some probable duplicates where people have used more than one
email address. I didn't deduplicate because -- well, who's to say they're
duplicates, anyway? :)
  • Loading branch information
ssbr committed Apr 24, 2017
1 parent acf7429 commit 19fc55f
Show file tree
Hide file tree
Showing 17 changed files with 128 additions and 18 deletions.
110 changes: 110 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1,111 @@
Baptiste Lepilleur <[email protected]>

Aaron Jacobs <[email protected]>
Aaron Jacobs <[email protected]>
Adam Boseley <[email protected]>
Adam Boseley <[email protected]>
Aleksandr Derbenev <[email protected]>
Alexander Gazarov <[email protected]>
Alexander V. Brezgin <[email protected]>
Alexandr Brezgin <[email protected]>
Alexey Kruchinin <[email protected]>
Anton Indrawan <[email protected]>
Baptiste Jonglez <[email protected]>
Baptiste Lepilleur <[email protected]>
Baruch Siach <[email protected]>
Ben Boeckel <[email protected]>
Benjamin Knecht <[email protected]>
Bernd Kuhls <[email protected]>
Billy Donahue <[email protected]>
Braden McDorman <[email protected]>
Brandon Myers <[email protected]>
Brendan Drew <[email protected]>
chason <[email protected]>
Chris Gilling <[email protected]>
Christopher Dawes <[email protected]>
Christopher Dunn <[email protected]>
Chuck Atkins <[email protected]>
Cody P Schafer <[email protected]>
Connor Manning <[email protected]>
Cory Quammen <[email protected]>
Cristóvão B da Cruz e Silva <[email protected]>
Daniel Krügler <[email protected]>
Dani-Hub <[email protected]>
Dan Liu <gzliudan>
datadiode <[email protected]>
datadiode <[email protected]>
David Seifert <[email protected]>
David West <[email protected]>
dawesc <[email protected]>
Dmitry Marakasov <[email protected]>
dominicpezzuto <[email protected]>
Don Milham <[email protected]>
drgler <[email protected]>
ds283 <[email protected]>
Egor Tensin <[email protected]>
eightnoteight <[email protected]>
Evince <[email protected]>
filipjs <[email protected]>
findblar <[email protected]>
Florian Meier <[email protected]>
Gaëtan Lehmann <[email protected]>
Gaurav <[email protected]>
Gergely Nagy <[email protected]>
Gida Pataki <[email protected]>
I3ck <[email protected]>
Iñaki Baz Castillo <[email protected]>
Jacco <[email protected]>
Jean-Christophe Fillion-Robin <[email protected]>
Jonas Platte <[email protected]>
Jörg Krause <[email protected]>
Keith Lea <[email protected]>
Kevin Grant <[email protected]>
Kirill V. Lyadvinsky <[email protected]>
Kirill V. Lyadvinsky <[email protected]>
Kobi Gurkan <[email protected]>
Magnus Bjerke Vik <[email protected]>
Malay Shah <[email protected]>
Mara Kim <[email protected]>
Marek Kotewicz <[email protected]>
Mark Lakata <[email protected]>
Mark Zeren <[email protected]>
Martin Buck <[email protected]>
Martyn Gigg <[email protected]>
Mattes D <[email protected]>
Matthias Loy <[email protected]>
Merlyn Morgan-Graham <[email protected]>
Michael Shields <[email protected]>
Michał Górny <[email protected]>
Mike Naberezny <[email protected]>
mloy <[email protected]>
Motti <[email protected]>
nnkur <[email protected]>
Omkar Wagh <[email protected]>
paulo <[email protected]>
pavel.pimenov <[email protected]>
Paweł Bylica <[email protected]>
Péricles Lopes Machado <[email protected]>
Peter Spiess-Knafl <[email protected]>
pffang <[email protected]>
Rémi Verschelde <[email protected]>
renu555 <[email protected]>
Robert Dailey <[email protected]>
Sam Clegg <[email protected]>
selaselah <[email protected]>
Sergiy80 <[email protected]>
sergzub <[email protected]>
Stefan Schweter <[email protected]>
Steffen Kieß <[email protected]>
Steven Hahn <[email protected]>
Stuart Eichert <[email protected]>
SuperManitu <[email protected]>
Techwolf <[email protected]>
Tengiz Sharafiev <[email protected]>
Tomasz Maciejewski <[email protected]>
Vicente Olivert Riera <[email protected]>
xiaoyur347 <[email protected]>
ycqiu <[email protected]>
yiqiju <[email protected]>
Yu Xiaolei <[email protected]>

Google Inc.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ The JsonCpp library's source code, including accompanying documentation,
tests and demonstration applications, are licensed under the following
conditions...

The author (Baptiste Lepilleur) explicitly disclaims copyright in all
The JsonCpp Authors explicitly disclaim copyright in all
jurisdictions which recognize such a disclaimer. In such jurisdictions,
this software is released into the Public Domain.

In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
released under the terms of the MIT License (see below).

In jurisdictions which recognize Public Domain property, the user of this
Expand All @@ -23,7 +23,7 @@ described in clear, concise terms at:
The full text of the MIT License follows:

========================================================================
Copyright (c) 2007-2010 Baptiste Lepilleur
Copyright (c) 2007-2010 The JsonCpp Authors

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
2 changes: 1 addition & 1 deletion devtools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2010 Baptiste Lepilleur
# Copyright 2010 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion devtools/antglob.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# encoding: utf-8
# Copyright 2009 Baptiste Lepilleur
# Copyright 2009 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion devtools/fixeol.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2010 Baptiste Lepilleur
# Copyright 2010 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion devtools/licenseupdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# and ends with the first blank line.
LICENSE_BEGIN = "// Copyright "

BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur
BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors
// Distributed under MIT license, or public domain if desired and
// recognized in your jurisdiction.
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion devtools/tarball.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2010 Baptiste Lepilleur
# Copyright 2010 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion makerelease.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2010 Baptiste Lepilleur
# Copyright 2010 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/globtool.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2009 Baptiste Lepilleur
# Copyright 2009 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/srcdist.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/substinfile.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2010 Baptiste Lepilleur
# Copyright 2010 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion scons-tools/targz.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion test/cleantests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion test/generate_expected.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion test/pyjsontestrunner.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion test/runjsontests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2007 Baptiste Lepilleur
# Copyright 2007 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down
2 changes: 1 addition & 1 deletion test/rununittests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2009 Baptiste Lepilleur
# Copyright 2009 The JsonCpp Authors
# Distributed under MIT license, or public domain if desired and
# recognized in your jurisdiction.
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
Expand Down

0 comments on commit 19fc55f

Please sign in to comment.