JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fixes license and attribution issues

Browse Source
This commit is contained in:
Sam Hatchett
2018-04-09 12:10:19 -04:00
parent 612dd380a4
commit 3de23845f5
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.mailmap
View File

@@ -6,4 +6,8 @@ Hyoungmin Woo <hyoungmin.woo@gmail.com> <woohn@mail.uc.edu>
Yunier Soad <yunier.soad@gmail.com>
Jinduan Chen <jinduan.uc@gmail.com>
Maurizio Cingi <mrzcng2@gmail.com>
Elad Salomons <selad@optiwater.com> <elad.salomons@gmail.com>
Elad Salomons <selad@optiwater.com> <elad.salomons@gmail.com>
Angela Marchi <angela.marchi@adelaide.edu.au>
Angela Marchi <angela.marchi@adelaide.edu.au> <a1219261@adelaide.edu.au>
Bryant McDonnell <bemcdonnell@gmail.com>
Marios Kyriakou <mariosmsk@gmail.com>

8
AUTHORS
View File

@@ -1,8 +1,9 @@
# Authors ordered by first contribution.
# Generated by tools/update-authors.sh
# and modified to reflect works in the public domain (denoted by ***)
Lew Rossman <LRossman@cinci.rr.com>
Michael Tryby <tryby.michael@epa.gov>
Lew Rossman <LRossman@cinci.rr.com> ***
Michael Tryby <tryby.michael@epa.gov> ***
Sam Hatchett <samhatchett@gmail.com>
Feng Shang <fshang>
James Uber <jim@citilogics.com>
@@ -14,7 +15,8 @@ Mike Kane <muke195@gmail.com>
Demetrios Eliades <eldemet@gmail.com>
Will Furnass <will@thearete.co.uk>
Steffen Macke <sdteffen@sdteffen.de>
Mariosmsk <mariosmsk@gmail.com>
Marios Kyriakou <mariosmsk@gmail.com>
Elad Salomons <selad@optiwater.com>
Maurizio Cingi <mrzcng2@gmail.com>
Bryant McDonnell <bemcdonnell@gmail.com>
Angela Marchi <angela.marchi@adelaide.edu.au>

22
LICENSE Normal file
View File

@@ -0,0 +1,22 @@
MIT License
Works are copyright (c) 2018 their respective AUTHORS,
unless such work is in the Public Domain (again, see AUTHORS)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

5
tools/update-authors.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh
##
##
## This script will auto-generate the AUTHORS attribution file.
## If your name does not display correctly, then please
## update the .mailmap file in the root repo directory
@@ -25,7 +25,8 @@ END {
print "# Authors ordered by first contribution.\n";
print "# Generated by tools/update-authors.sh\n";
print "\n", @authors;
print "\n*** = works in the public domain";
}
' > ../AUTHORS
'