summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 00:05:45 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-01 00:05:45 +0000
commit7f4db91fc8b0a96c65d35b092ac9cee613f3bda7 (patch)
treeef55050d004db733fb72cb0fd9e9fcd94ffada49 /third_party
parentcf47ab64dd2650b11409efad057e4bd7a31318fb (diff)
downloadchromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.zip
chromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.tar.gz
chromium_src-7f4db91fc8b0a96c65d35b092ac9cee613f3bda7.tar.bz2
Make the license tools recoginze the dual license
BUG=98116 TEST= Review URL: http://codereview.chromium.org/8094004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/devscripts/chromium-1.patch17
-rwxr-xr-xthird_party/devscripts/licensecheck.pl4
2 files changed, 17 insertions, 4 deletions
diff --git a/third_party/devscripts/chromium-1.patch b/third_party/devscripts/chromium-1.patch
index 75b7d16..960f94e 100644
--- a/third_party/devscripts/chromium-1.patch
+++ b/third_party/devscripts/chromium-1.patch
@@ -1,5 +1,5 @@
---- licensecheck.pl.orig 2011-09-29 22:37:51.668584727 +0100
-+++ licensecheck.pl 2011-09-29 21:15:10.238581840 +0100
+--- licensecheck.pl.orig 2011-09-30 11:26:05.132392850 -0700
++++ licensecheck.pl 2011-09-30 11:29:27.662389093 -0700
@@ -241,6 +241,12 @@
my @find_args = ();
my $files_count = @ARGV;
@@ -81,7 +81,7 @@
$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/) {
$license = "MIT/X11 (BSD like) $license";
-@@ -448,15 +437,21 @@
+@@ -448,15 +437,19 @@
}
if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/) {
@@ -106,6 +106,17 @@
}
if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) {
+@@ -475,7 +468,9 @@
+ $license = "Perl $license";
+ }
+
+- if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
++ if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR version 2 of the GNU/) {
++ $license = "Apache (v$1) GPL (v2) $license";
++ } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
+ $license = "Apache (v$1) $license";
+ }
+
@@ -495,7 +490,7 @@
$license = "SGI Free Software License B $license";
}
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl
index 1afbacdd..9e12df1 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -470,7 +470,9 @@ sub parselicense($) {
$license = "Perl $license";
}
- if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
+ if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR version 2 of the GNU/) {
+ $license = "Apache (v$1) GPL (v2) $license";
+ } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) {
$license = "Apache (v$1) $license";
}