OLD | NEW |
1 --- licensecheck.pl.orig» 2011-09-29 22:37:51.668584727 +0100 | 1 --- licensecheck.pl.orig» 2011-09-30 11:26:05.132392850 -0700 |
2 +++ licensecheck.pl» 2011-09-29 21:15:10.238581840 +0100 | 2 +++ licensecheck.pl» 2011-09-30 11:29:27.662389093 -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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 74 |
75 @@ -437,7 +426,7 @@ | 75 @@ -437,7 +426,7 @@ |
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 $license = "MIT/X11 (BSD like) $license"; | 83 $license = "MIT/X11 (BSD like) $license"; |
84 @@ -448,15 +437,21 @@ | 84 @@ -448,15 +437,19 @@ |
85 } | 85 } |
86 | 86 |
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/) { | 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/) { |
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) { | 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) { |
89 + if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following/) { | 89 + if ($licensetext =~ /All advertising materials mentioning features or us
e of this software must display the following/) { |
90 $license = "BSD (4 clause) $license"; | 90 $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) { | 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) { |
92 + } elsif ($licensetext =~ /be used to endorse or promote products derived
from this software/) { | 92 + } elsif ($licensetext =~ /be used to endorse or promote products derived
from this software/) { |
93 $license = "BSD (3 clause) $license"; | 93 $license = "BSD (3 clause) $license"; |
94 - } elsif ($licensetext =~ /Redistributions of source code must retain the
above copyright notice/i) { | 94 - } elsif ($licensetext =~ /Redistributions of source code must retain the
above copyright notice/i) { |
95 + } elsif ($licensetext =~ /Redistributions of source code must retain the
above copyright notice/) { | 95 + } elsif ($licensetext =~ /Redistributions of source code must retain the
above copyright notice/) { |
96 $license = "BSD (2 clause) $license"; | 96 $license = "BSD (2 clause) $license"; |
97 } else { | 97 } else { |
98 $license = "BSD $license"; | 98 $license = "BSD $license"; |
99 } | 99 } |
100 + } elsif ($licensetext =~ /Use of this source code is governed by a BSD-styl
e license/) { | 100 + } elsif ($licensetext =~ /Use of this source code is governed by a BSD-styl
e license/) { |
101 + $license = "BSD-like $license"; | 101 + $license = "BSD-like $license"; |
102 + } elsif ($licensetext =~ /BSD terms apply/) { | 102 + } elsif ($licensetext =~ /BSD terms apply/) { |
103 + $license = "BSD-like $license"; | 103 + $license = "BSD-like $license"; |
104 + } elsif ($licensetext =~ /GOVERNED BY A BSD-STYLE SOURCE LICENSE/) { | 104 + } elsif ($licensetext =~ /GOVERNED BY A BSD-STYLE SOURCE LICENSE/) { |
105 + $license = "BSD-like $license"; | 105 + $license = "BSD-like $license"; |
106 } | 106 } |
107 | 107 |
108 if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) { | 108 if ($licensetext =~ /Mozilla Public License Version ([^ ]+)/) { |
| 109 @@ -475,7 +468,9 @@ |
| 110 $license = "Perl $license"; |
| 111 } |
| 112 |
| 113 - if ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { |
| 114 + if ($licensetext =~ /under the terms of the Apache ([^ ]+) License OR versi
on 2 of the GNU/) { |
| 115 + $license = "Apache (v$1) GPL (v2) $license"; |
| 116 + } elsif ($licensetext =~ /under the Apache License, Version ([^ ]+)/) { |
| 117 $license = "Apache (v$1) $license"; |
| 118 } |
| 119 |
109 @@ -495,7 +490,7 @@ | 120 @@ -495,7 +490,7 @@ |
110 $license = "SGI Free Software License B $license"; | 121 $license = "SGI Free Software License B $license"; |
111 } | 122 } |
112 | 123 |
113 - if ($licensetext =~ /is in the public domain/i) { | 124 - if ($licensetext =~ /is in the public domain/i) { |
114 + if ($licensetext =~ /in the public domain/i) { | 125 + if ($licensetext =~ /in the public domain/i) { |
115 $license = "Public domain"; | 126 $license = "Public domain"; |
116 } | 127 } |
117 | 128 |
118 @@ -503,6 +498,10 @@ | 129 @@ -503,6 +498,10 @@ |
(...skipping 21 matching lines...) Expand all Loading... |
140 - $license = "WTFPL"; | 151 - $license = "WTFPL"; |
141 - } | 152 - } |
142 - | 153 - |
143 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { | 154 - if ($licensetext =~ /(License WTFPL|Under (the|a) WTFPL)/i) { |
144 - $license = "WTFPL"; | 155 - $license = "WTFPL"; |
145 + } elsif ($licensetext =~ /This code is released under the libpng license/)
{ | 156 + } elsif ($licensetext =~ /This code is released under the libpng license/)
{ |
146 + $license = "libpng $license"; | 157 + $license = "libpng $license"; |
147 } | 158 } |
148 | 159 |
149 $license = "UNKNOWN" if (!length($license)); | 160 $license = "UNKNOWN" if (!length($license)); |
OLD | NEW |