diff --git a/mps/contributing.rst b/mps/contributing.rst index 82b5ff4c840..e806164f653 100644 --- a/mps/contributing.rst +++ b/mps/contributing.rst @@ -22,9 +22,11 @@ The style guide in guide.impl.c.format_ contains basic rules for style. Licensing --------- -In order for us to accept your contribution, you must agree to the MPS -contribution agreement, so that we can continue to commercially license the -MPS and thereby fund future development. +Prior to the 2020-05 re-licensing of the MPS under the BSD 2-clause +license, we required contributors to agree to the following +contribution agreement, so that we could continue to commercially +license the MPS and thereby fund future development. We have not yet +decided what may replace this requirement. I grant Ravenbrook Ltd an irrevocable, perpetual, worldwide, non-exclusive licence to do anything with [your contribution] that I diff --git a/mps/license.txt b/mps/license.txt index b7d68d57a79..c97f6c32abe 100644 --- a/mps/license.txt +++ b/mps/license.txt @@ -1,35 +1,27 @@ Memory Pool System Kit Open Source License ========================================== -This is the license under which the Memory Pool System Kit is available as -open source. +This is the license under which the Memory Pool System Kit is made +available by Ravenbrook Limited. This license is generally known as +the `BSD 2-clause license`_. It is `GPL compatible`_ and +`OSI approved`_. -**It is not the only way the MPS is licensed.** +For avoidance of doubt, this license supersedes any older licenses +that may appear in other files that are part of this distribution +and in any of its branches. -If the licensing terms aren't suitable for you (for example, you're -developing a closed-source commercial product or a compiler run-time -system) you can easily license the MPS under different terms from -Ravenbrook. Please write to us at ``_ -for more information. - -The open source license for the MPS is the `Sleepycat License`_ also -known as the "Berkeley Database License". This license is -`GPL compatible`_ and `OSI approved`_. The MPS is "multi licensed" in -a manner similar to MySQL. +Prior to 2020, the MPS was "multi-licensed" under the `Sleepycat +License`_ and also by other specifically arranged license agreements. .. _Sleepycat License: https://en.wikipedia.org/wiki/Sleepycat_License -.. _GPL compatible: http://www.gnu.org/licenses/license-list.html -.. _OSI approved: http://opensource.org/licenses/sleepycat - +.. _GPL compatible: https://www.gnu.org/licenses/license-list.html +.. _OSI approved: https://opensource.org/licenses/sleepycat +.. _BSD 2-clause license: https://opensource.org/licenses/BSD-2-Clause License ------- -Copyright © 2001–2013 `Ravenbrook Limited `_. -All rights reserved. This is the open source license for the Memory -Pool System, but it is not the only one. Contact Ravenbrook at -``_ if you would like a different -license. +Copyright © 2001–2020 `Ravenbrook Limited `_. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -43,39 +35,15 @@ met: documentation and/or other materials provided with the distribution. -3. Redistributions in any form must be accompanied by information on - how to obtain complete source code for this software and any - accompanying software that uses this software. The source code - must either be included in the distribution or be available for no - more than the cost of distribution plus a nominal fee, and must be - freely redistributable under reasonable conditions. For an - executable file, complete source code means the source code for all - modules it contains. It does not include source code for modules - or files that typically accompany the major components of the - operating system on which the executable file runs. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Exceptions ----------- - -**Open Dylan** - - Software that makes use of the Memory Pool System only via the Dylan - programming language using the Open Dylan implementation and any - accompanying software is exempt from clause 3 of the license, provided - that the Dylan program is not providing memory management services. For - the avoidance of doubt, this exemption does not apply to software - directly using a copy of the Memory Pool System received as part of the - Open Dylan source code. diff --git a/mps/readme.txt b/mps/readme.txt index 115ec3d01d3..54f9739d67e 100644 --- a/mps/readme.txt +++ b/mps/readme.txt @@ -28,16 +28,8 @@ commercial products since 1997. Bugs are almost unknown in production. It is under continuous development and support by `Ravenbrook `__. -The MPS is distributed under an open source license (see -``_). The license is designed to make it possible for you -to use the MPS in your own projects, provided that you either don't -distribute your product, or your product is open source too. - -If the licensing terms aren't suitable for you (for example, you're -developing a closed-source commercial product or a compiler run-time -system) you can easily license the MPS under different terms from -Ravenbrook. Please write to us at mps-questions@ravenbrook.com -for more information. +The MPS is distributed under the BSD 2-clause open source license (see +``_). Getting started @@ -129,13 +121,15 @@ Document History 2008-05-01 RHSK_ Release 1.108.2 2010-03-03 RHSK_ Release 1.109.0 2012-08-14 RB_ Updating build instructions for new platforms. -2012-09-05 RB_ Considerably reduced ready for version 1.110. Now +2012-09-05 RB_ Considerably reduced ready for version 1.110. Now brought to you in glorious reStructuredText. 2014-01-13 GDR_ Updated supported platforms. 2014-07-04 GDR_ Link to hotfix for WOW64 bug. 2016-03-24 RB_ Adding support for FreeBSD with Clang/LLVM. +2020-05-22 PNJ_ Changed to BSD 2-clause licence. ========== ===== ====================================================== +.. _PNJ: mailto:pnj@ravenbrook.com .. _GDR: mailto:gdr@ravenbrook.com .. _NB: mailto:nb@ravenbrook.com .. _RB: mailto:rb@ravenbrook.com @@ -145,9 +139,7 @@ Document History Copyright and Licence --------------------- -Copyright (C) 2001-2018 Ravenbrook Limited. All rights reserved. -. This is an open source license. Contact -Ravenbrook for commercial licensing options. +Copyright © 2001–2020 `Ravenbrook Limited `_. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -158,28 +150,18 @@ met: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + documentation and/or other materials provided with the + distribution. -3. Redistributions in any form must be accompanied by information on how - to obtain complete source code for this software and any - accompanying software that uses this software. The source code must - either be included in the distribution or be available for no more than - the cost of distribution plus a nominal fee, and must be freely - redistributable under reasonable conditions. For an executable file, - complete source code means the source code for all modules it contains. - It does not include source code for modules or files that typically - accompany the major components of the operating system on which the - executable file runs. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -**This software is provided by the copyright holders and contributors -"as is" and any express or implied warranties, including, but not -limited to, the implied warranties of merchantability, fitness for a -particular purpose, or non-infringement, are disclaimed. In no event -shall the copyright holders and contributors be liable for any direct, -indirect, incidental, special, exemplary, or consequential damages -(including, but not limited to, procurement of substitute goods or -services; loss of use, data, or profits; or business interruption) -however caused and on any theory of liability, whether in contract, -strict liability, or tort (including negligence or otherwise) arising in -any way out of the use of this software, even if advised of the -possibility of such damage.**