Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: third_party/devscripts/licensecheck.pl.orig

Issue 8486004: Update licensecheck to 2.11.2, which contains upstreamed patches: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/devscripts/licensecheck.pl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/devscripts/licensecheck.pl.orig
diff --git a/third_party/devscripts/licensecheck.pl.orig b/third_party/devscripts/licensecheck.pl.orig
index 5224f69e3a010a8373dc4b34482769894227dced..3a0634a63e48ede9c2b33a467becadafde80c134 100644
--- a/third_party/devscripts/licensecheck.pl.orig
+++ b/third_party/devscripts/licensecheck.pl.orig
@@ -125,7 +125,7 @@ Adam D. Barratt <adam@adam-barratt.org.uk>
use strict;
use warnings;
-use Getopt::Long;
+use Getopt::Long qw(:config gnu_getopt);
use File::Basename;
sub fatal($);
@@ -406,7 +406,7 @@ sub parselicense($) {
$extrainfo = " (with Qt exception)$extrainfo"
}
- if ($licensetext =~ /(All changes made in this file will be lost|DO NOT (EDIT|delete this file)|Generated by)/i) {
+ if ($licensetext =~ /(All changes made in this file will be lost|DO NOT (EDIT|delete this file)|Generated (automatically|by|from)|generated.*file)/i) {
$license = "GENERATED FILE";
}
@@ -437,9 +437,11 @@ sub parselicense($) {
$license = "QPL $license";
}
- if ($licensetext =~ /http:\/\/opensource\.org\/licenses\/mit-license\.php/) {
+ if ($licensetext =~ /opensource\.org\/licenses\/mit-license\.php/) {
$license = "MIT/X11 (BSD like) $license";
- } elsif ($licensetext =~ /Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files \(the Software\), to deal in the Software/) {
+ } elsif ($licensetext =~ /Permission is hereby granted, free of charge, to any person obtaining a copy of this software and(\/or)? associated documentation files \(the (Software|Materials)\), to deal in the (Software|Materials)/) {
+ $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";
}
@@ -450,7 +452,7 @@ sub parselicense($) {
if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/) {
if ($licensetext =~ /All advertising materials mentioning features or use of this software must display the following acknowledge?ment.*This product includes software developed by/i) {
$license = "BSD (4 clause) $license";
- } elsif ($licensetext =~ /(The name of .*? may not|Neither the names? of .*? nor the names of (its|their) contributors may) be used to endorse or promote products derived from this software/i) {
+ } elsif ($licensetext =~ /(The name .*? may not|Neither the names? .*? nor the names of (its|their) contributors may) be used to endorse or promote products derived from this software/i) {
$license = "BSD (3 clause) $license";
} elsif ($licensetext =~ /Redistributions of source code must retain the above copyright notice/i) {
$license = "BSD (2 clause) $license";
@@ -503,6 +505,10 @@ sub parselicense($) {
$license = "CDDL " . ($1 ? "(v$2) " : '') . $license;
}
+ if ($licensetext =~ /Microsoft Permissive License \(Ms-PL\)/) {
+ $license = "Ms-PL $license";
+ }
+
if ($licensetext =~ /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\"\)/ or
$licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) {
$license = "BSL " . ($1 ? "(v$2) " : '') . $license;
@@ -515,6 +521,8 @@ sub parselicense($) {
if ($licensetext =~ /The origin of this software must not be misrepresented.*Altered source versions must be plainly marked as such.*This notice may not be removed or altered from any source distribution/ or
$licensetext =~ /see copyright notice in zlib\.h/) {
$license = "zlib/libpng $license";
+ } elsif ($licensetext =~ /This code is released under the libpng license/) {
+ $license = "libpng $license";
}
if ($licensetext =~ /Do What The Fuck You Want To Public License, Version ([^, ]+)/i) {
« no previous file with comments | « third_party/devscripts/licensecheck.pl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698