New LICENSE/AUTHORS arrangement

7 files changed, 44 insertions, 35 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..9780708
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,7 @@
+This file contains information about the build2 authors for copyright
+purposes.
+
+The copyright for the code is held by the contributors of the code. The
+revision history in the version control system is the primary source of
+authorship information for copyright purposes. Contributors that have
+requested to also be noted explicitly in this file are listed below:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a3216bb..6bfc34f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,16 @@
 This project is part of the `build2` toolchain; see its
 [Community](https://build2.org/community.xhtml) page for various ways to
 contribute.
+
+The copyright for the code is held by the contributors of the code (see the
+`AUTHORS` file). The code is licensed under permissive open source licensing
+terms (see the `LICENSE` file). When you contribute code to this project, you
+license it under these terms. Before contributing please make sure that these
+terms are acceptable to you (and to your employer(s), if they have rights to
+intellectual property that you create) and that the code being contributed is
+your original creation.
+
+The revision history in the version control system is the primary source of
+authorship information for copyright purposes. If, however, you would like
+to also be noted explicitly, please include the appropriate change to the
+`AUTHORS` file along with your contribution.
diff --git a/COPYRIGHT b/COPYRIGHT
deleted file mode 100644
index eec7815..0000000
--- a/COPYRIGHT
+++ /dev/null
@@ -1,11 +0,0 @@
-Copyright (c) 2014-2020 Code Synthesis Ltd and the build2 contributors.
-
-For the full list of contributors, see the revision history in version control
-system.
-
-The copyright for the code is held by the contributors of the code. The code
-is licensed under permissive open source licensing terms (see the accompanying
-LICENSE file). When you contribute code to this project, you license it under
-these terms. Before contributing please make sure these terms are acceptable
-to you (or the organization that employs you) and that you are the author of
-the code being contributed.
diff --git a/LICENSE b/LICENSE
index a0d1bd1..107aae8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,23 +5,22 @@ https://git.codesynthesis.com/cgit/odb/odb-etc/tree/license-exceptions/build2-od
 
 MIT License
 
-See the accompanying COPYRIGHT file for the copyright information.
+Copyright (c) 2014-2020 the build2 authors (see the AUTHORS file).
 
-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:
+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 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.
+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.
diff --git a/bdep/buildfile b/bdep/buildfile
index 06b6b02..5ed00a0 100644
--- a/bdep/buildfile
+++ b/bdep/buildfile
@@ -75,11 +75,12 @@ for t: cxx{**.test...}
 #
 obj{utility}: cxx.poptions += -DBDEP_EXE_SUFFIX='"'$bin.exe.suffix'"'
 
-# Pass the copyright notice extracted from the COPYRIGHT file.
+# Pass the copyright notice extracted from the LICENSE file.
 #
-copyright = $process.run_regex(cat $src_root/COPYRIGHT,  \
-                               'Copyright \(c\) (.+)\.', \
-                               '\1')
+copyright = $process.run_regex(                      \
+  cat $src_root/LICENSE,                             \
+  'Copyright \(c\) (.+) \(see the AUTHORS file\)\.', \
+  '\1')
 
 obj{bdep}: cxx.poptions += -DBDEP_COPYRIGHT=\"$copyright\"
 
diff --git a/buildfile b/buildfile
index b030c7c..91ac1e2 100644
--- a/buildfile
+++ b/buildfile
@@ -1,8 +1,8 @@
 # file      : buildfile
 # license   : MIT; see accompanying LICENSE file
 
-./: {*/ -build/}                                               \
-    doc{INSTALL LICENSE COPYRIGHT NEWS README CONTRIBUTING.md} \
+./: {*/ -build/}                                             \
+    doc{INSTALL LICENSE AUTHORS NEWS README CONTRIBUTING.md} \
     manifest
 
 # Don't install tests or the INSTALL file.
diff --git a/doc/cli.sh b/doc/cli.sh
index 3d1f397..35bbde0 100755
--- a/doc/cli.sh
+++ b/doc/cli.sh
@@ -9,7 +9,7 @@ function info () { echo "$*" 1>&2; }
 function error () { info "$*"; exit 1; }
 
 date="$(date +"%B %Y")"
-copyright="$(sed -n -re 's%^Copyright \(c\) (.+)\.$%\1%p' ../COPYRIGHT)"
+copyright="$(sed -n -re 's%^Copyright \(c\) (.+) \(see the AUTHORS file\)\.$%\1%p' ../LICENSE)"
 
 while [ $# -gt 0 ]; do
   case $1 in