New LICENSE/AUTHORS arrangement

6 files changed, 28 insertions, 23 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 6e4969c..b19bd4b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,7 @@
-libbuild2/cc/msvc-setup.h:
-
-MIT License, see the file header for details. This file comes from the
-Microsoft.VisualStudio.Setup.Configuration.Native NuGet package and is
-originally named Setup.Configuration.h.
-
-The rest:
-
 MIT License
 
-See the accompanying COPYRIGHT file for the copyright information.
+Copyright (c) 2014-2020 the build2 authors (see the AUTHORS file).
+Copyright (c) Microsoft Corporation for the libbuild2/cc/msvc-setup.h file.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/buildfile b/buildfile
index 5fcaec3..3c1374f 100644
--- a/buildfile
+++ b/buildfile
@@ -1,9 +1,9 @@
 # file      : buildfile
 # license   : MIT; see accompanying LICENSE file
 
-./: {*/ -build/ -config/ -old-tests/}                          \
-    doc{INSTALL LICENSE COPYRIGHT NEWS README CONTRIBUTING.md} \
-    file{INSTALL.cli bootstrap* config.guess config.sub}       \
+./: {*/ -build/ -config/ -old-tests/}                        \
+    doc{INSTALL LICENSE AUTHORS NEWS README CONTRIBUTING.md} \
+    file{INSTALL.cli bootstrap* config.guess config.sub}     \
     manifest
 
 # Don't install tests or the INSTALL file.
diff --git a/libbuild2/cc/msvc-setup.h b/libbuild2/cc/msvc-setup.h
index 94f7481..3873979 100644
--- a/libbuild2/cc/msvc-setup.h
+++ b/libbuild2/cc/msvc-setup.h
@@ -1,3 +1,6 @@
+// This file comes from the Microsoft.VisualStudio.Setup.Configuration.Native

+// NuGet package where it is called Setup.Configuration.h.

+//

 // The MIT License(MIT)

 // Copyright(C) Microsoft Corporation.All rights reserved.

 //