diff options
| author | nbarth@chromium.org <nbarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 00:39:47 +0000 |
|---|---|---|
| committer | nbarth@chromium.org <nbarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 00:39:47 +0000 |
| commit | e2ee6039bcc2a55717e688fff42eeb93e973093d (patch) | |
| tree | 967801d773f680ea695d720f60dd56131babafe5 /tools | |
| parent | 9d72a177ce7713c277f095966b05f2627560213d (diff) | |
| download | chromium_src-e2ee6039bcc2a55717e688fff42eeb93e973093d.zip chromium_src-e2ee6039bcc2a55717e688fff42eeb93e973093d.tar.gz chromium_src-e2ee6039bcc2a55717e688fff42eeb93e973093d.tar.bz2 | |
Fix comma and LGPL bugs in licensecheck.pl
This fixes some comma bugs:
* removes trailing comma in version number,
* converts comma as decimal point to period.
...and fixes a bug where LGPL is also detected as GPL (unversioned),
which simplifies the license list.
The following files have LGPL, hence got mis-detected as
LGPL + GPL (unversioned), which is fixed by this CL.
third_party/WebKit/Source/wtf/DateMath.cpp
third_party/WebKit/Source/core/platform/text/UnicodeRange.h
third_party/WebKit/Source/core/platform/text/UnicodeRange.cpp
third_party/WebKit/Source/core/platform/Arena.cpp
third_party/WebKit/Source/core/platform/Arena.h
third_party/WebKit/Source/core/platform/image-decoders/png/PNGImageDecoder.cpp
third_party/WebKit/Source/core/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
third_party/WebKit/Source/core/rendering/ScrollBehavior.h
third_party/WebKit/Source/core/rendering/RenderArena.cpp
third_party/WebKit/Source/core/rendering/RenderMarquee.h
third_party/WebKit/Source/core/rendering/ScrollBehavior.cpp
third_party/WebKit/Source/core/rendering/RenderLayer.cpp
third_party/WebKit/Source/core/rendering/RenderLayer.h
third_party/WebKit/Source/core/rendering/RenderMarquee.cpp
third_party/WebKit/Source/core/rendering/RenderArena.h
third_party/WebKit/Source/core/html/HTMLDocument.cpp
Review URL: https://chromiumcodereview.appspot.com/16331008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index 9de6712..98bb71b 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -52,35 +52,33 @@ WHITELISTED_LICENSES = [ 'BSD-like MIT/X11 (BSD like)', 'BSL (v1.0)', + 'GPL (v2) LGPL (v2.1 or later)', 'GPL (v2 or later) with Bison parser exception', 'GPL (v2 or later) with libtool exception', 'GPL (v3 or later) with Bison parser exception', 'GPL with Bison parser exception', 'ISC', - 'LGPL', + 'LGPL (unversioned/unknown version)', 'LGPL (v2)', 'LGPL (v2 or later)', 'LGPL (v2.1)', - 'LGPL (v3 or later)', - - # TODO(phajdan.jr): Make licensecheck convert that comma to a dot. - 'LGPL (v2,1 or later)', - 'LGPL (v2.1 or later)', + 'LGPL (v3 or later)', + 'MIT/X11 (BSD like)', 'MPL (v1.0) LGPL (v2 or later)', 'MPL (v1.1)', + 'MPL (v1.1) BSD (3 clause) GPL (v2) LGPL (v2.1 or later)', + 'MPL (v1.1) BSD (3 clause) LGPL (v2.1 or later)', 'MPL (v1.1) BSD-like', 'MPL (v1.1) BSD-like GPL (unversioned/unknown version)', - 'MPL (v1.1,) BSD (3 clause) GPL (unversioned/unknown version) ' - 'LGPL (v2.1 or later)', + 'MPL (v1.1) BSD-like GPL (v2) LGPL (v2.1 or later)', + 'MPL (v1.1) GPL (v2)', + 'MPL (v1.1) GPL (v2) LGPL (v2 or later)', + 'MPL (v1.1) GPL (v2) LGPL (v2.1 or later)', 'MPL (v1.1) GPL (unversioned/unknown version)', + 'MPL (v1.1) LGPL (v2 or later)', + 'MPL (v1.1) LGPL (v2.1 or later)', 'MPL (v2.0)', - - # TODO(phajdan.jr): Make licensecheck not print the comma after 1.1. - 'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2 or later)', - 'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2.1 or later)', - - 'MIT/X11 (BSD like)', 'Ms-PL', 'Public domain', 'Public domain BSD', |