From 1fd45bb923c5a15861227a338b4be87637c6c37b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 18 Feb 2020 11:11:19 +0200 Subject: New LICENSE/AUTHORS arrangement --- AUTHORS | 7 +++++++ CONTRIBUTING.md | 13 +++++++++++++ COPYRIGHT | 12 +----------- LICENSE | 6 +++--- buildfile | 4 ++-- libbutl/sha1.c | 3 +-- libbutl/sha256c.c | 3 +-- 7 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 AUTHORS 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 index eec7815..af15f5b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,11 +1 @@ -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. +Copyright (c) 2014-2020 the build2 authors (see the AUTHORS file). diff --git a/LICENSE b/LICENSE index acb9f07..4998e51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,16 +1,16 @@ libbutl/sha1.c: -3-clause BSD License, see the file header for details. +3-clause BSD License; see the file header for details. libbutl/{sha256c.c, strptime.c, timelocal.h, timelocal.c}: -2-clause BSD License, see the file headers for details. +2-clause BSD License; see the file headers for details. The rest: MIT License -See the accompanying COPYRIGHT file for the copyright information. +Copyright information is in the COPYRIGHT 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 b030c7c..ee8922f 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 COPYRIGHT AUTHORS NEWS README CONTRIBUTING.md} \ manifest # Don't install tests or the INSTALL file. diff --git a/libbutl/sha1.c b/libbutl/sha1.c index af9d9a9..5326208 100644 --- a/libbutl/sha1.c +++ b/libbutl/sha1.c @@ -1,8 +1,7 @@ /* $KAME: sha1.c,v 1.5 2000/11/08 06:13:08 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * Copyright (c) Code Synthesis Ltd and the build2 contributors; see - * the accompanying COPYRIGHT file for details. + * Copyright (c) the build2 authors (see the COPYRIGHT file). * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/libbutl/sha256c.c b/libbutl/sha256c.c index 6f670ba..2db0363 100644 --- a/libbutl/sha256c.c +++ b/libbutl/sha256c.c @@ -1,7 +1,6 @@ /*- * Copyright 2005 Colin Percival - * Copyright (c) Code Synthesis Ltd and the build2 contributors; see - * the accompanying COPYRIGHT file for details. + * Copyright (c) the build2 authors (see the COPYRIGHT file). * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.1