From 969161cb788c7a61c8b229cf82952349e368cae7 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Fri, 26 Jun 2009 22:06:46 +0000 Subject: [PATCH] Relicense cpplint under 3 clause BSD for webkit folks. Review URL: http://codereview.chromium.org/147238 --- cpplint/README | 31 ++++++++++++++++++++++++++----- cpplint/cpplint.py | 30 ++++++++++++++++++++++++------ cpplint/cpplint_unittest.py | 30 ++++++++++++++++++++++++------ 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/cpplint/README b/cpplint/README index db3d19d..4ffb1eb 100644 --- a/cpplint/README +++ b/cpplint/README @@ -14,11 +14,32 @@ Unit tests are provided in cpplint_unittest.py. This file can safely be ignored by end users who have downloaded this package and only want to run the lint tool. +--- + cpplint.py and its corresponding unit tests are Copyright (C) 2009 Google Inc. -It is free software; you can redistribute it and/or modify it under the terms -of either: - a) the GNU General Public License as published by the Free Software - Foundation; either version 1, or (at your option) any later version, or +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: - b) the "Artistic License". + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +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 +OWNER 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. diff --git a/cpplint/cpplint.py b/cpplint/cpplint.py index f7adef7..bc46f09 100755 --- a/cpplint/cpplint.py +++ b/cpplint/cpplint.py @@ -1,14 +1,32 @@ #!/usr/bin/python2.4 # -# cpplint.py is Copyright (C) 2009 Google Inc. +# Copyright (c) 2009 Google Inc. All rights reserved. # -# It is free software; you can redistribute it and/or modify it under the -# terms of either: +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: # -# a) the GNU General Public License as published by the Free Software -# Foundation; either version 1, or (at your option) any later version, or +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. # -# b) the "Artistic License". +# 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 +# OWNER 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. # Here are some issues that I've had people identify in my code during reviews, # that I think are possible to flag automatically in a lint tool. If these were diff --git a/cpplint/cpplint_unittest.py b/cpplint/cpplint_unittest.py index 5b4b919..7fafa87 100755 --- a/cpplint/cpplint_unittest.py +++ b/cpplint/cpplint_unittest.py @@ -1,15 +1,33 @@ #!/usr/bin/python2.4 # -*- coding: utf-8; -*- # -# cpplint_unittest.py is Copyright (C) 2009 Google Inc. +# Copyright (c) 2009 Google Inc. All rights reserved. # -# It is free software; you can redistribute it and/or modify it under the -# terms of either: +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: # -# a) the GNU General Public License as published by the Free Software -# Foundation; either version 1, or (at your option) any later version, or +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * 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. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. # -# b) the "Artistic License". +# 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 +# OWNER 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. """Unit test for cpplint.py."""