| OLD | NEW |
| 1 --- licensecheck.pl.orig» 2011-09-22 10:51:25.934402455 -0700 | 1 --- licensecheck.pl.orig» 2011-10-21 14:02:13.282141718 -0700 |
| 2 +++ licensecheck.pl» 2011-10-03 09:49:41.651443138 -0700 | 2 +++ licensecheck.pl» 2011-10-21 14:07:54.802155126 -0700 |
| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 + if ($licensetext =~ /as defined in and that are subject to the Apple Public
Source License([ ,-]+Version ([^ ]+)?(\.))/) { | 137 + if ($licensetext =~ /as defined in and that are subject to the Apple Public
Source License([ ,-]+Version ([^ ]+)?(\.))/) { |
| 138 + $license = "APSL " . ($1 ? "(v$2) " : '') . $license; | 138 + $license = "APSL " . ($1 ? "(v$2) " : '') . $license; |
| 139 + } elsif ($licensetext =~ /provided that if you redistribute the Apple Softw
are in its entirety and without modifications, you must retain this notice and t
he following text and disclaimers in all such redistributions of the Apple Softw
are/) { | 139 + } elsif ($licensetext =~ /provided that if you redistribute the Apple Softw
are in its entirety and without modifications, you must retain this notice and t
he following text and disclaimers in all such redistributions of the Apple Softw
are/) { |
| 140 + # https://fedoraproject.org/wiki/Licensing/Apple_MIT_License | 140 + # https://fedoraproject.org/wiki/Licensing/Apple_MIT_License |
| 141 + $license = "Apple MIT $license"; | 141 + $license = "Apple MIT $license"; |
| 142 + } | 142 + } |
| 143 + | 143 + |
| 144 if ($licensetext =~ /Permission is hereby granted, free of charge, to any p
erson or organization obtaining a copy of the software and accompanying document
ation covered by this license \(the \"Software\"\)/ or | 144 if ($licensetext =~ /Permission is hereby granted, free of charge, to any p
erson or organization obtaining a copy of the software and accompanying document
ation covered by this license \(the \"Software\"\)/ or |
| 145 $licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) { | 145 $licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) { |
| 146 $license = "BSL " . ($1 ? "(v$2) " : '') . $license; | 146 $license = "BSL " . ($1 ? "(v$2) " : '') . $license; |
| 147 @@ -515,18 +523,8 @@ | 147 @@ -515,18 +523,12 @@ |
| 148 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 | 148 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 |
| 149 $licensetext =~ /see copyright notice in zlib\.h/) { | 149 $licensetext =~ /see copyright notice in zlib\.h/) { |
| 150 $license = "zlib/libpng $license"; | 150 $license = "zlib/libpng $license"; |
| 151 - } | 151 + } elsif ($licensetext =~ /This code is released under the libpng license/)
{ |
| 152 - | 152 + $license = "libpng $license"; |
| 153 } |
| 154 |
| 153 - if ($licensetext =~ /Do What The Fuck You Want To Public License, Version (
[^, ]+)/i) { | 155 - if ($licensetext =~ /Do What The Fuck You Want To Public License, Version (
[^, ]+)/i) { |
| 154 - $license = "WTFPL (v$1)"; | 156 - $license = "WTFPL (v$1)"; |
| 155 - } | 157 - } |
| 156 - | 158 - |
| 157 - if ($licensetext =~ /Do what The Fuck You Want To Public License/i) { | 159 - if ($licensetext =~ /Do what The Fuck You Want To Public License/i) { |
| 158 - $license = "WTFPL"; | 160 - $license = "WTFPL"; |
| 159 - } | 161 - } |
| 160 - | 162 - |
| 161 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { | 163 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { |
| 162 - $license = "WTFPL"; | 164 - $license = "WTFPL"; |
| 163 + } elsif ($licensetext =~ /This code is released under the libpng license/)
{ | 165 + if ($licensetext =~ /under MIT license/) { |
| 164 + $license = "libpng $license"; | 166 + $license = "MIT/X11 (BSD like) $license"; |
| 165 } | 167 } |
| 166 | 168 |
| 167 $license = "UNKNOWN" if (!length($license)); | 169 $license = "UNKNOWN" if (!length($license)); |
| OLD | NEW |