aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-02-18 14:42:16 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2020-02-18 14:44:03 (GMT)
commit70a65d42f926f95a0e479e40e3021622fa31ad06 (patch)
tree226f55a0b81dddabf4f40ebb5809c3225da36be0
parent2c91bf04a45762d69210ce45b4c0e196505451bd (diff)
New LICENSE/AUTHORS arrangementHEADmaster
-rw-r--r--AUTHORS7
-rw-r--r--COPYRIGHT11
-rw-r--r--LICENSE33
-rw-r--r--buildfile8
4 files changed, 27 insertions, 32 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/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 6ab7903..2cf3738 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,22 +1,21 @@
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/buildfile b/buildfile
index 9c4cd0e..04c7053 100644
--- a/buildfile
+++ b/buildfile
@@ -9,10 +9,10 @@ sh{*}:
install = bin/
}
-./: msvc-common/exe{msvc-filter} \
- sh{cl-* lib-* link-* mt-* rc-*} \
- sh{msvc-** -msvc-common/msvc-filter*} \
- doc{INSTALL LICENSE COPYRIGHT NEWS README} \
+./: msvc-common/exe{msvc-filter} \
+ sh{cl-* lib-* link-* mt-* rc-*} \
+ sh{msvc-** -msvc-common/msvc-filter*} \
+ doc{INSTALL LICENSE AUTHORS NEWS README} \
manifest
msvc-common/