Skip to content

Commit 747f3cf

Browse files
committed
Changed Phobos to use the Boost license. Currently, all public domain 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.
1 parent c74aeae commit 747f3cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+5017
-5190
lines changed

LICENSE_1_0.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Boost Software License - Version 1.0 - August 17th, 2003
2+
3+
Permission is hereby granted, free of charge, to any person or organization
4+
obtaining a copy of the software and accompanying documentation covered by
5+
this license (the "Software") to use, reproduce, display, distribute,
6+
execute, and transmit the Software, and to prepare derivative works of the
7+
Software, and to permit third-parties to whom the Software is furnished to
8+
do so, all subject to the following:
9+
10+
The copyright notices in the Software and this entire statement, including
11+
the above license grant, this restriction and the following disclaimer,
12+
must be included in all copies of the Software, in whole or in part, and
13+
all derivative works of the Software, unless such copies or derivative
14+
works are solely in the form of machine-executable object code generated by
15+
a source language processor.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

osx.mak

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ $$(OBJDIR)/$1/$2/unittest/std/% : std/%.d \
118118
@touch $$@
119119

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

123123
PRODUCTIONLIB_$1 = $(PRODUCTIONLIBDIR)/libphobos2$(LIBSUFFIX_$1)
124124
ifeq ($2,release)
125125
$1/$2 : $$(PRODUCTIONLIB_$1)
126126
$$(PRODUCTIONLIB_$1) : $$(LIB_$1_$2)
127-
ln -sf $$(realpath $$<) $$@
127+
sudo ln -sf $$(realpath $$<) $$@
128128
else
129129
$1/$2 : $$(LIB_$1_$2)
130130
endif

phobos.d

-3
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ D language compiler. Also, check out the
169169
<dt><a href="object.html"><b>object</b></a>
170170
<dd>The root class of the inheritance hierarchy
171171
172-
<dt><a href="std_openrj.html"><b>std.openrj</b></a>
173-
<dd>Basic database.
174-
175172
<dt><a href="std_outbuffer.html"><b>std.outbuffer</b></a>
176173
<dd>Assemble data into an array of bytes
177174

phoboslicense.txt

-31
This file was deleted.

std/__fileinit.d

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
/*
2-
* Placed in the Public Domain
3-
* Written by Walter Bright
4-
*/
1+
// Written in the D programming language.
52

6-
/* The only purpose of this module is to do the static construction
7-
* for std.file, to eliminate cyclic construction errors.
3+
/**
4+
* The only purpose of this module is to do the static construction for
5+
* std.file, to eliminate cyclic construction errors.
6+
*
7+
* Copyright: Copyright Digital Mars 2008 - 2009.
8+
* License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
9+
* Authors: $(WEB digitalmars.com, Walter Bright)
10+
*
11+
* Copyright Digital Mars 2008 - 2009.
12+
* Distributed under the Boost Software License, Version 1.0.
13+
* (See accompanying file LICENSE_1_0.txt or copy at
14+
* http://www.boost.org/LICENSE_1_0.txt)
815
*/
9-
10-
1116
module std.__fileinit;
1217

1318
version (Win32)

std/algorithm.d

+10-26
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ those found in the $(D $(LESS)_algorithm$(GREATER)) header in $(WEB
77
sgi.com/tech/stl/, Alexander Stepanov's Standard Template Library) for
88
C++.
99
10-
Author:
11-
$(WEB erdani.org, Andrei Alexandrescu)
12-
1310
Note:
1411
1512
Many functions in this module are parameterized with a function or a
@@ -39,9 +36,18 @@ sort(a); // no predicate, "a < b" is implicit
3936
4037
Macros:
4138
WIKI = Phobos/StdAlgorithm
42-
*/
4339
40+
Copyright: Copyright Andrei Alexandrescu 2008 - 2009.
41+
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
42+
Authors: $(WEB erdani.org, Andrei Alexandrescu)
43+
44+
Copyright Andrei Alexandrescu 2008 - 2009.
45+
Distributed under the Boost Software License, Version 1.0.
46+
(See accompanying file LICENSE_1_0.txt or copy at
47+
http://www.boost.org/LICENSE_1_0.txt)
48+
*/
4449
module std.algorithm;
50+
4551
import std.c.string;
4652
import std.array;
4753
import std.contracts;
@@ -5771,25 +5777,3 @@ unittest
57715777
//writeln(b[0]);
57725778
assert(b[0] == tuple(4.0, 2u));
57735779
}
5774-
5775-
/*
5776-
* Copyright (C) 2004-2006 by Digital Mars, www.digitalmars.com
5777-
* Written by Andrei Alexandrescu, www.erdani.org
5778-
*
5779-
* This software is provided 'as-is', without any express or implied
5780-
* warranty. In no event will the authors be held liable for any damages
5781-
* arising from the use of this software.
5782-
*
5783-
* Permission is granted to anyone to use this software for any purpose,
5784-
* including commercial applications, and to alter it and redistribute it
5785-
* freely, subject to the following restrictions:
5786-
*
5787-
* o The origin of this software must not be misrepresented; you must not
5788-
* claim that you wrote the original software. If you use this software
5789-
* in a product, an acknowledgment in the product documentation would be
5790-
* appreciated but is not required.
5791-
* o Altered source versions must be plainly marked as such, and must not
5792-
* be misrepresented as being the original software.
5793-
* o This notice may not be removed or altered from any source
5794-
* distribution.
5795-
*/

std/array.d

+11-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
// Written in the D programming language
1+
// Written in the D programming language.
22

3+
/**
4+
Copyright: Copyright Andrei Alexandrescu 2008 - 2009.
5+
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
6+
Authors: $(WEB erdani.org, Andrei Alexandrescu)
7+
8+
Copyright Andrei Alexandrescu 2008 - 2009.
9+
Distributed under the Boost Software License, Version 1.0.
10+
(See accompanying file LICENSE_1_0.txt or copy at
11+
http://www.boost.org/LICENSE_1_0.txt)
12+
*/
313
module std.array;
414

515
import std.c.stdio;
@@ -820,25 +830,3 @@ unittest
820830
// s.length = 7;
821831
// assert(equal(s, [10, 10, 6, 5, 9, 0, 0][]));
822832
}
823-
824-
/*
825-
* Copyright (C) 2004-2009 by Digital Mars, www.digitalmars.com
826-
* Written by Andrei Alexandrescu, www.erdani.org
827-
*
828-
* This software is provided 'as-is', without any express or implied
829-
* warranty. In no event will the authors be held liable for any damages
830-
* arising from the use of this software.
831-
*
832-
* Permission is granted to anyone to use this software for any purpose,
833-
* including commercial applications, and to alter it and redistribute it
834-
* freely, subject to the following restrictions:
835-
*
836-
* o The origin of this software must not be misrepresented; you must not
837-
* claim that you wrote the original software. If you use this software
838-
* in a product, an acknowledgment in the product documentation would be
839-
* appreciated but is not required.
840-
* o Altered source versions must be plainly marked as such, and must not
841-
* be misrepresented as being the original software.
842-
* o This notice may not be removed or altered from any source
843-
* distribution.
844-
*/

std/atomics.d

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
// Written in the D programming language
2-
// Put in the public domain by Bartosz Milewski
1+
// Written in the D programming language.
32

43
/**
54
Implements processor dependent parts of the atomics library.
65
7-
8-
Author: Bartosz Milewski
96
Macros:
107
WIKI = Phobos/Atomics
8+
9+
Copyright: Copyright Bartosz Milewski 2008 - 2009.
10+
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
11+
Authors: Bartosz Milewski
12+
13+
Copyright Bartosz Milewski 2008 - 2009.
14+
Distributed under the Boost Software License, Version 1.0.
15+
(See accompanying file LICENSE_1_0.txt or copy at
16+
http://www.boost.org/LICENSE_1_0.txt)
1117
*/
1218

1319
version (D_InlineAsm_X86)
@@ -65,11 +71,11 @@ asm {
6571
unittest
6672
{
6773
uint x = 1;
68-
bool success = CAS(&x, 1, 2);
69-
assert(success);
70-
assert(x == 2);
71-
72-
success = CAS(&x, 1, 3);
73-
assert(!success);
74-
assert(x == 2);
74+
bool success = CAS(&x, 1, 2);
75+
assert(success);
76+
assert(x == 2);
77+
78+
success = CAS(&x, 1, 3);
79+
assert(!success);
80+
assert(x == 2);
7581
}

std/base64.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Written in the D programming language
1+
// Written in the D programming language.
22

33
/**
44
* Encodes/decodes MIME base64 data.

std/bigint.d

+11-10
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,19 @@ Example:
3434
assert(i == e);
3535
----------------------------------------------------
3636
37-
Authors: Janice Caron
38-
39-
Date: 2008.05.18
40-
41-
License: Public Domain
42-
43-
4437
Macros:
4538
WIKI=Phobos/StdBigint
46-
*/
4739
48-
module bigint;
40+
Copyright: Copyright Janice Caron 2008 - 2009.
41+
License: <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
42+
Authors: Janice Caron
43+
44+
Copyright Janice Caron 2008 - 2009.
45+
Distributed under the Boost Software License, Version 1.0.
46+
(See accompanying file LICENSE_1_0.txt or copy at
47+
http://www.boost.org/LICENSE_1_0.txt)
48+
*/
49+
module std.bigint;
4950

5051
import std.string : format;
5152
import std.stdio : writef, writefln;
@@ -1591,7 +1592,7 @@ debug unittest
15911592
auto z = makeBig( 0x00012345, 0x6789ABCD, 0xEFEDCBA9, 0x87654321 );
15921593
auto r = mul(x,y);
15931594
assert(r.digits == z.digits, hex(r));
1594-
// Bugzilla 2987
1595+
// Bugzilla 2987
15951596
BigInt a = "871782912000";
15961597
BigInt b = "760005445655199744000000";
15971598
assert(a * a == b);

0 commit comments

Comments
 (0)