From 6e75ce0e995a3db2488b23ca786ae0a9d8f6398a Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Fri, 20 Dec 2013 08:58:28 +0000 Subject: [PATCH] Support dual licensing under MIT and the University of Illinois/NCSA (these are the licenses used by libc++ and libc++abi) BUG=329819 R=phajdan.jr@chromium.org, phajdan@chromium.org Review URL: https://codereview.chromium.org/103493008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242046 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/devscripts/licensecheck.pl | 4 +++- tools/checklicenses/checklicenses.py | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl index f7be5c5c0d6f..f4260dde12f6 100755 --- a/third_party/devscripts/licensecheck.pl +++ b/third_party/devscripts/licensecheck.pl @@ -491,9 +491,11 @@ sub parselicense($) { $license = "MIT/X11 (BSD like) $license"; } elsif ($licensetext =~ /Permission is hereby granted, without written agreement and without license or royalty fees, to use, copy, modify, and distribute this software and its documentation for any purpose/) { $license = "MIT/X11 (BSD like) $license"; + } elsif ($licensetext =~ /MIT .* License/) { + $license = "MIT/X11 (BSD like) $license"; } - if ($licensetext =~ /This file is distributed under the University of Illinois Open Source License/){ + if ($licensetext =~ /the University of Illinois Open Source License/){ $license = "University of Illinois/NCSA Open Source License (BSD like) $license"; } diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index b1cc0a73af60..420e23708a54 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -91,6 +91,8 @@ WHITELISTED_LICENSES = [ 'zlib/libpng', 'SGI Free Software License B', 'University of Illinois/NCSA Open Source License (BSD like)', + ('University of Illinois/NCSA Open Source License (BSD like) ' + 'MIT/X11 (BSD like)'), ] -- 2.11.4.GIT