Skip to content

Commit

Permalink
Merge pull request #4010 from ibuclaw/licence
Browse files Browse the repository at this point in the history
Clean up distributed license files
  • Loading branch information
yebblies committed Sep 24, 2014
2 parents eb55fbf + c2a29b9 commit cfe52d3
Show file tree
Hide file tree
Showing 19 changed files with 80 additions and 426 deletions.
117 changes: 0 additions & 117 deletions src/artistic.txt

This file was deleted.

8 changes: 4 additions & 4 deletions src/backend/aa.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2000-2009 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/aa.c


#include <stdio.h>
Expand Down
8 changes: 4 additions & 4 deletions src/backend/aa.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2006-2009 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/aa.h



Expand Down
6 changes: 3 additions & 3 deletions src/backend/cv8.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gnu.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/cv8.c

// This module generates the .debug$S and .debug$T sections for Win64,
// which are the MS-Coff symbolic debug info and type debug info sections.
Expand Down
8 changes: 4 additions & 4 deletions src/backend/dwarf.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 1999-2013 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/dwarf.c

// Emit Dwarf symbolic debug info

Expand Down
8 changes: 4 additions & 4 deletions src/backend/machobj.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2009-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/machobj.c


#if SCPP || MARS
Expand Down
8 changes: 4 additions & 4 deletions src/backend/mscoffobj.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2009-2012 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/mscoffobj.c


#if MARS
Expand Down
6 changes: 3 additions & 3 deletions src/backend/pdata.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gnu.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/pdata.c

// This module generates the .pdata and .xdata sections for Win64

Expand Down
8 changes: 3 additions & 5 deletions src/backend/ph2.c
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@


// Compiler implementation of the D programming language
// Copyright (c) 1999-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gnu.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/ph2.c

#include <stdio.h>
#include <time.h>
Expand Down
8 changes: 4 additions & 4 deletions src/backend/ti_achar.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2006-2009 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/ti_achar.c


#include <string.h>
Expand Down
8 changes: 4 additions & 4 deletions src/backend/ti_pvoid.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2011-2011 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/ti_pvoid.c


#include <stdlib.h>
Expand Down
8 changes: 4 additions & 4 deletions src/backend/tinfo.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

// Compiler implementation of the D programming language
// Copyright (c) 2000-2009 by Digital Mars
// All Rights Reserved
// written by Walter Bright
// http://www.digitalmars.com
// License for redistribution is by either the Artistic License
// in artistic.txt, or the GNU General Public License in gpl.txt.
// See the included readme.txt for details.
// Distributed under the Boost Software License, Version 1.0.
// http://www.boost.org/LICENSE_1_0.txt
// https://github.com/D-Programming-Language/dmd/blob/master/src/backend/tinfo.h


#ifndef TYPEINFO_H
Expand Down
23 changes: 23 additions & 0 deletions src/boostlicense.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.
Loading

0 comments on commit cfe52d3

Please sign in to comment.