Skip to content

Commit

Permalink
Changed Phobos to use the Boost license. Currently, all public domain…
Browse files Browse the repository at this point in the history
… modules and all licensed modules by Walter, Andrei, Bartosz, and Don have been changed to use this license (excepting std.c, for the moment). Ideally, all Phobos modules will eventually be distributed under this license, which means obtaining permission from a few more authors, deleting, or rewriting some modules.

Removed std.openrj.
  • Loading branch information
complexmath committed Sep 16, 2009
1 parent c74aeae commit 747f3cf
Show file tree
Hide file tree
Showing 65 changed files with 5,017 additions and 5,190 deletions.
23 changes: 23 additions & 0 deletions LICENSE_1_0.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
4 changes: 2 additions & 2 deletions osx.mak
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ $$(OBJDIR)/$1/$2/unittest/std/% : std/%.d \
@touch $$@

$(PRODUCTIONLIBDIR)/libphobos2tmp_$2$$(LIBSUFFIX_$1) : $$(LIB_$1_$2)
ln -sf $$(realpath $$<) $$@
sudo ln -sf $$(realpath $$<) $$@

PRODUCTIONLIB_$1 = $(PRODUCTIONLIBDIR)/libphobos2$(LIBSUFFIX_$1)
ifeq ($2,release)
$1/$2 : $$(PRODUCTIONLIB_$1)
$$(PRODUCTIONLIB_$1) : $$(LIB_$1_$2)
ln -sf $$(realpath $$<) $$@
sudo ln -sf $$(realpath $$<) $$@
else
$1/$2 : $$(LIB_$1_$2)
endif
Expand Down
3 changes: 0 additions & 3 deletions phobos.d
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,6 @@ D language compiler. Also, check out the
<dt><a href="object.html"><b>object</b></a>
<dd>The root class of the inheritance hierarchy
<dt><a href="std_openrj.html"><b>std.openrj</b></a>
<dd>Basic database.
<dt><a href="std_outbuffer.html"><b>std.outbuffer</b></a>
<dd>Assemble data into an array of bytes
Expand Down
31 changes: 0 additions & 31 deletions phoboslicense.txt

This file was deleted.

21 changes: 13 additions & 8 deletions std/__fileinit.d
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
/*
* Placed in the Public Domain
* Written by Walter Bright
*/
// Written in the D programming language.

/* The only purpose of this module is to do the static construction
* for std.file, to eliminate cyclic construction errors.
/**
* The only purpose of this module is to do the static construction for
* std.file, to eliminate cyclic construction errors.
*
* Copyright: Copyright Digital Mars 2008 - 2009.
* License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
* Authors: $(WEB digitalmars.com, Walter Bright)
*
* Copyright Digital Mars 2008 - 2009.
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*/


module std.__fileinit;

version (Win32)
Expand Down
36 changes: 10 additions & 26 deletions std/algorithm.d
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ those found in the $(D $(LESS)_algorithm$(GREATER)) header in $(WEB
sgi.com/tech/stl/, Alexander Stepanov's Standard Template Library) for
C++.
Author:
$(WEB erdani.org, Andrei Alexandrescu)
Note:
Many functions in this module are parameterized with a function or a
Expand Down Expand Up @@ -39,9 +36,18 @@ sort(a); // no predicate, "a < b" is implicit
Macros:
WIKI = Phobos/StdAlgorithm
*/
Copyright: Copyright Andrei Alexandrescu 2008 - 2009.
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
Authors: $(WEB erdani.org, Andrei Alexandrescu)
Copyright Andrei Alexandrescu 2008 - 2009.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/
module std.algorithm;

import std.c.string;
import std.array;
import std.contracts;
Expand Down Expand Up @@ -5771,25 +5777,3 @@ unittest
//writeln(b[0]);
assert(b[0] == tuple(4.0, 2u));
}

/*
* Copyright (C) 2004-2006 by Digital Mars, www.digitalmars.com
* Written by Andrei Alexandrescu, www.erdani.org
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* o The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* o Altered source versions must be plainly marked as such, and must not
* be misrepresented as being the original software.
* o This notice may not be removed or altered from any source
* distribution.
*/
34 changes: 11 additions & 23 deletions std/array.d
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
// Written in the D programming language
// Written in the D programming language.

/**
Copyright: Copyright Andrei Alexandrescu 2008 - 2009.
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
Authors: $(WEB erdani.org, Andrei Alexandrescu)
Copyright Andrei Alexandrescu 2008 - 2009.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/
module std.array;

import std.c.stdio;
Expand Down Expand Up @@ -820,25 +830,3 @@ unittest
// s.length = 7;
// assert(equal(s, [10, 10, 6, 5, 9, 0, 0][]));
}

/*
* Copyright (C) 2004-2009 by Digital Mars, www.digitalmars.com
* Written by Andrei Alexandrescu, www.erdani.org
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* o The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* o Altered source versions must be plainly marked as such, and must not
* be misrepresented as being the original software.
* o This notice may not be removed or altered from any source
* distribution.
*/
28 changes: 17 additions & 11 deletions std/atomics.d
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
// Written in the D programming language
// Put in the public domain by Bartosz Milewski
// Written in the D programming language.

/**
Implements processor dependent parts of the atomics library.
Author: Bartosz Milewski
Macros:
WIKI = Phobos/Atomics
Copyright: Copyright Bartosz Milewski 2008 - 2009.
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
Authors: Bartosz Milewski
Copyright Bartosz Milewski 2008 - 2009.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/

version (D_InlineAsm_X86)
Expand Down Expand Up @@ -65,11 +71,11 @@ asm {
unittest
{
uint x = 1;
bool success = CAS(&x, 1, 2);
assert(success);
assert(x == 2);
success = CAS(&x, 1, 3);
assert(!success);
assert(x == 2);
bool success = CAS(&x, 1, 2);
assert(success);
assert(x == 2);
success = CAS(&x, 1, 3);
assert(!success);
assert(x == 2);
}
2 changes: 1 addition & 1 deletion std/base64.d
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Written in the D programming language
// Written in the D programming language.

/**
* Encodes/decodes MIME base64 data.
Expand Down
21 changes: 11 additions & 10 deletions std/bigint.d
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,19 @@ Example:
assert(i == e);
----------------------------------------------------
Authors: Janice Caron
Date: 2008.05.18
License: Public Domain
Macros:
WIKI=Phobos/StdBigint
*/
module bigint;
Copyright: Copyright Janice Caron 2008 - 2009.
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
Authors: Janice Caron
Copyright Janice Caron 2008 - 2009.
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
*/
module std.bigint;

import std.string : format;
import std.stdio : writef, writefln;
Expand Down Expand Up @@ -1591,7 +1592,7 @@ debug unittest
auto z = makeBig( 0x00012345, 0x6789ABCD, 0xEFEDCBA9, 0x87654321 );
auto r = mul(x,y);
assert(r.digits == z.digits, hex(r));
// Bugzilla 2987
// Bugzilla 2987
BigInt a = "871782912000";
BigInt b = "760005445655199744000000";
assert(a * a == b);
Expand Down
Loading

0 comments on commit 747f3cf

Please sign in to comment.