OLD | NEW |
1 --- licensecheck.pl.orig» 2011-10-21 14:02:13.282141718 -0700 | 1 --- licensecheck.pl.orig» 2011-11-02 20:24:19.000000000 +0000 |
2 +++ licensecheck.pl» 2011-10-21 14:07:54.802155126 -0700 | 2 +++ licensecheck.pl» 2011-11-02 20:24:38.000000000 +0000 |
3 @@ -241,6 +241,12 @@ | 3 @@ -241,6 +241,12 @@ |
4 my @find_args = (); | 4 my @find_args = (); |
5 my $files_count = @ARGV; | 5 my $files_count = @ARGV; |
6 | 6 |
7 +push @find_args, qw(-not ( -path */LayoutTests/* -prune ) ); | 7 +push @find_args, qw(-not ( -path */LayoutTests/* -prune ) ); |
8 +push @find_args, qw(-not ( -path */out/Debug/* -prune ) ); | 8 +push @find_args, qw(-not ( -path */out/Debug/* -prune ) ); |
9 +push @find_args, qw(-not ( -path */out/Release/* -prune ) ); | 9 +push @find_args, qw(-not ( -path */out/Release/* -prune ) ); |
10 +push @find_args, qw(-not ( -path *.git* -prune ) ); | 10 +push @find_args, qw(-not ( -path *.git* -prune ) ); |
11 +push @find_args, qw(-not ( -path *.svn* -prune ) ); | 11 +push @find_args, qw(-not ( -path *.svn* -prune ) ); |
12 + | 12 + |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 + } elsif ($licensetext =~ /is distributed under the terms of the GNU General
Public License,/ | 65 + } elsif ($licensetext =~ /is distributed under the terms of the GNU General
Public License,/ |
66 and length $gplver) { | 66 and length $gplver) { |
67 $license = "GPL$gplver$extrainfo $license"; | 67 $license = "GPL$gplver$extrainfo $license"; |
68 - } | 68 - } |
69 - | 69 - |
70 - if ($licensetext =~ /is distributed.*terms.*GPL/) { | 70 - if ($licensetext =~ /is distributed.*terms.*GPL/) { |
71 + } elsif ($licensetext =~ /is distributed.*terms.*GPL/) { | 71 + } elsif ($licensetext =~ /is distributed.*terms.*GPL/) { |
72 $license = "GPL (unversioned/unknown version) $license"; | 72 $license = "GPL (unversioned/unknown version) $license"; |
73 } | 73 } |
74 | 74 |
75 @@ -437,7 +426,7 @@ | 75 @@ -437,9 +426,9 @@ |
76 $license = "QPL $license"; | 76 $license = "QPL $license"; |
77 } | 77 } |
78 | 78 |
79 - if ($licensetext =~ /http:\/\/opensource\.org\/licenses\/mit-license\.php/)
{ | 79 - if ($licensetext =~ /http:\/\/opensource\.org\/licenses\/mit-license\.php/)
{ |
80 + if ($licensetext =~ /opensource\.org\/licenses\/mit-license\.php/) { | 80 + if ($licensetext =~ /opensource\.org\/licenses\/mit-license\.php/) { |
81 $license = "MIT/X11 (BSD like) $license"; | 81 $license = "MIT/X11 (BSD like) $license"; |
82 } 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/) { | 82 - } 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/) { |
| 83 + } 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)/) { |
83 $license = "MIT/X11 (BSD like) $license"; | 84 $license = "MIT/X11 (BSD like) $license"; |
| 85 } |
| 86 |
84 @@ -448,15 +437,21 @@ | 87 @@ -448,15 +437,21 @@ |
85 } | 88 } |
86 | 89 |
87 if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR I
MPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERC
HANTABILITY/) { | 90 if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR I
MPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERC
HANTABILITY/) { |
88 - if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following acknowledge?ment.*This product inc
ludes software developed by/i) { | 91 - if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following acknowledge?ment.*This product inc
ludes software developed by/i) { |
89 + if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following/) { | 92 + if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following/) { |
90 $license = "BSD (4 clause) $license"; | 93 $license = "BSD (4 clause) $license"; |
91 - } elsif ($licensetext =~ /(The name of .*? may not|Neither the names? of
.*? nor the names of (its|their) contributors may) be used to endorse or promot
e products derived from this software/i) { | 94 - } elsif ($licensetext =~ /(The name of .*? may not|Neither the names? of
.*? nor the names of (its|their) contributors may) be used to endorse or promot
e products derived from this software/i) { |
92 + } elsif ($licensetext =~ /be used to endorse or promote products derived
from this software/) { | 95 + } elsif ($licensetext =~ /be used to endorse or promote products derived
from this software/) { |
93 $license = "BSD (3 clause) $license"; | 96 $license = "BSD (3 clause) $license"; |
(...skipping 16 matching lines...) Expand all Loading... |
110 $license = "Perl $license"; | 113 $license = "Perl $license"; |
111 } | 114 } |
112 | 115 |
113 - if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { | 116 - if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { |
114 + if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR versi
on 2 of the GNU/) { | 117 + if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR versi
on 2 of the GNU/) { |
115 + $license = "Apache (v$1) GPL (v2) $license"; | 118 + $license = "Apache (v$1) GPL (v2) $license"; |
116 + } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { | 119 + } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { |
117 $license = "Apache (v$1) $license"; | 120 $license = "Apache (v$1) $license"; |
118 } | 121 } |
119 | 122 |
120 @@ -495,7 +492,7 @@ | 123 @@ -491,11 +488,11 @@ |
| 124 » $license = "CeCILL-$1 $license"; |
| 125 } |
| 126 |
| 127 - if ($licensetext =~ /under the SGI Free Software License B/) { |
| 128 + if ($licensetext =~ /under the SGI Free Software (B License|License B)/) { |
121 $license = "SGI Free Software License B $license"; | 129 $license = "SGI Free Software License B $license"; |
122 } | 130 } |
123 | 131 |
124 - if ($licensetext =~ /is in the public domain/i) { | 132 - if ($licensetext =~ /is in the public domain/i) { |
125 + if ($licensetext =~ /in the public domain/i) { | 133 + if ($licensetext =~ /in the public domain/i) { |
126 $license = "Public domain"; | 134 $license = "Public domain"; |
127 } | 135 } |
128 | 136 |
129 @@ -503,6 +500,17 @@ | 137 @@ -503,6 +500,17 @@ |
130 $license = "CDDL " . ($1 ? "(v$2) " : '') . $license; | 138 $license = "CDDL " . ($1 ? "(v$2) " : '') . $license; |
(...skipping 29 matching lines...) Expand all Loading... |
160 - $license = "WTFPL"; | 168 - $license = "WTFPL"; |
161 - } | 169 - } |
162 - | 170 - |
163 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { | 171 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { |
164 - $license = "WTFPL"; | 172 - $license = "WTFPL"; |
165 + if ($licensetext =~ /under MIT license/) { | 173 + if ($licensetext =~ /under MIT license/) { |
166 + $license = "MIT/X11 (BSD like) $license"; | 174 + $license = "MIT/X11 (BSD like) $license"; |
167 } | 175 } |
168 | 176 |
169 $license = "UNKNOWN" if (!length($license)); | 177 $license = "UNKNOWN" if (!length($license)); |
OLD | NEW |