marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update license texts 

Some files, most notably ObjC and test cases, hadn't been updated to use
the new license header. Fix this.
issue1247
Nicolas Hake 2015-02-07 15:55:05 +01:00
parent 0076fc7d7b
commit 1a1cecadd4
20 changed files with 161 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
COPYING
View File

@ -1,5 +1,5 @@
Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
Copyright (c) 2009-2013, The OpenClonk Team and contributors
Copyright (c) 2009-2015, The OpenClonk Team and contributors
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@ -31,10 +31,11 @@ Copyright (c) 2010-2011 Maikel de Vries
Copyright (c) 2010 Manuel Riecke
Copyright (c) 2009 Mark Haßelbusch
Copyright (c) 2009-2012 Martin Plicht
Copyright (c) 1998-2008 Matthes Bender
Copyright (c) 1998-2009 Matthes Bender
Copyright (c) 2001 Michael Käser
Copyright (c) 2009 mizipzor
Copyright (c) 2009-2013 Nicolas Hake
Copyright (c) 2013 Oliver Schneider
Copyright (c) 2010 Peewee
Copyright (c) 2001-2011 Peter Wortmann
Copyright (c) 2012 Philipp Kern

17
planet/Issues.ocf/System.ocg/Testing.c
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2013 Nicolas Hake
* Copyright (c) 2013, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
static __test_last_result;
@ -55,4 +56,4 @@ global func EXPECT_EQ(expected, actual, failure_msg)
} else {
++__test_last_result.ok;
}
}
}

15
planet/Issues.ocf/issue973.ocs/Script.c
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2013 Nicolas Hake
* Copyright (c) 2013, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
/* Issue #973: {Find,Sort}_* with no origin should use the FindObject call's

20
src/C4Version.h.in
View File

@ -1,23 +1,19 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2001-2002, 2010 Peter Wortmann
* Copyright (c) 2005, 2009-2010 Günther Brammer
* Copyright (c) 2009 Matthes Bender
* Copyright (c) 2013 Nicolas Hake
* Copyright (c) 2001-2009, RedWolf Design GmbH, http://www.clonk.de
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#ifndef C4VERSION_H
#define C4VERSION_H

16
src/editor/C4ConsoleCocoa.mm
View File

@ -1,16 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <GL/glew.h>

18
src/editor/C4EditorWindowController.mm
View File

@ -1,18 +1,18 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <GL/glew.h>
#include <C4Include.h>

16
src/graphics/C4DrawGLMac.mm
View File

@ -1,16 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

16
src/platform/C4AppDelegate+MainMenuActions.mm
View File

@ -1,16 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

17
src/platform/C4AppDelegate.mm
View File

@ -1,17 +1,18 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
// Roughly adapted from the original C4AppDelegate.m; haxxed to death by teh Gurkendoktor.
// Look at main() to get an idea for what happens here.

17
src/platform/C4AppMac.mm
View File

@ -1,20 +1,17 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2006 Julian Raschke
* Copyright (c) 2008-2009 Günther Brammer
* Copyright (c) 2005-2009, RedWolf Design GmbH, http://www.clonk.de
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
// based on SDL implementation

18
src/platform/C4FileMonitorMac.mm
View File

@ -1,18 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2010 Mortimer
* Copyright (c) 2010, The OpenClonk Team and contributors
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#ifdef __APPLE__
@ -114,4 +112,4 @@ void C4FileMonitor::GetFDs(std::vector<struct pollfd> & FDs) { }
bool C4FileMonitor::Execute(int iTimeout, pollfd *) { return true; }
#endif
#endif

16
src/platform/C4WindowController.mm
View File

@ -1,16 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

16
src/platform/C4WindowMac.mm
View File

@ -1,16 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Portions might be copyrighted by other authors who have contributed
* to OpenClonk.
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

17
src/platform/StdSchedulerMac.mm
View File

@ -1,3 +1,18 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2009-2015, The OpenClonk Team and contributors
*
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>
#include <StdScheduler.h>
#ifdef USE_COCOA
@ -283,4 +298,4 @@ void StdScheduler::Changed(StdSchedulerProc* pProc)
{
[[[SCHAdditions requestAdditionsForScheduler:this] additionForProc:pProc] changed];
}
#endif
#endif

15
tests/C4StringTableTest.cpp
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2013 Oliver Schneider
* Copyright (c) 2013, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

15
tests/C4ValueTest.cpp
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2013 Oliver Schneider
* Copyright (c) 2013, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

16
tests/CMakeLists.txt
View File

@ -1,17 +1,15 @@
# OpenClonk, http://www.openclonk.org
#
# Copyright (c) 2013 Oliver Schneider
# Copyright (c) 2013, The OpenClonk Team and contributors
#
# Portions might be copyrighted by other authors who have contributed
# to OpenClonk.
# Distributed under the terms of the ISC license; see accompanying file
# "COPYING" for details.
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
# See isc_license.txt for full license and disclaimer.
# "Clonk" is a registered trademark of Matthes Bender, used with permission.
# See accompanying file "TRADEMARK" for details.
#
# "Clonk" is a registered trademark of Matthes Bender.
# See clonk_trademark_license.txt for full license.
# To redistribute this file separately, substitute the full license texts
# for the above references.
cmake_minimum_required (VERSION 2.6.0)
project(openclonk_unittest)

15
tests/DirectExecTest.cpp
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2013 Oliver Schneider
* Copyright (c) 2013, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
#include <C4Include.h>

15
tests/UnicodeHandlingTest.cpp
View File

@ -1,15 +1,16 @@
/*
* OpenClonk, http://www.openclonk.org
*
* Copyright (c) 2011 Nicolas Hake
* Copyright (c) 2011, The OpenClonk Team and contributors
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
* See isc_license.txt for full license and disclaimer.
* Distributed under the terms of the ISC license; see accompanying file
* "COPYING" for details.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license texts
* for the above references.
*/
/* Verify correct behavior of UTF-8 handling code. */

7
tests/main.cpp
View File

@ -4,8 +4,11 @@
* This file is ineligible for copyright and therefore in the public domain,
* because it does not reach the required threshold of originality.
*
* "Clonk" is a registered trademark of Matthes Bender.
* See clonk_trademark_license.txt for full license.
* "Clonk" is a registered trademark of Matthes Bender, used with permission.
* See accompanying file "TRADEMARK" for details.
*
* To redistribute this file separately, substitute the full license text
* for the above reference.
*/
/* Runs all available tests. */