r108448 - in trunk/src: third_party/devscripts tools/checklicenses
skyo...@google.com
Date: Thu Nov 3 05:13:42 2011
New Revision: 108448
Log:
Fix license check for GL headers
The EGL headers are released under an MIT/X11 license by The Khronos
Group. This patch updates licensecheck.pl to recognize the
license wording as it describes "Materials" rather than "Software".
The OpenGL ES 2.0 headers are released under the SGI Free Software
License B (http://oss.sgi.com/projects/FreeB/) by The Khronos Group.
This license is added to the whitelist and licensecheck.pl is updated to
recognized the mistyped "SGI Free Software B License" which is used in
the header files.
BUG=98097
TEST=none
Review URL: http://codereview.chromium.org/8351079
Modified:
trunk/src/third_party/devscripts/chromium-1.patch
trunk/src/third_party/devscripts/licensecheck.pl
trunk/src/tools/checklicenses/checklicenses.py
Modified: trunk/src/third_party/devscripts/chromium-1.patch
==============================================================================
--- trunk/src/third_party/devscripts/chromium-1.patch (original)
+++ trunk/src/third_party/devscripts/chromium-1.patch Thu Nov 3 05:13:42 2011
@@ -1,5 +1,5 @@
---- licensecheck.pl.orig 2011-10-21 14:02:13.282141718 -0700
-+++ licensecheck.pl 2011-10-21 14:07:54.802155126 -0700
+--- licensecheck.pl.orig 2011-11-02 20:24:19.000000000 +0000
++++ licensecheck.pl 2011-11-02 20:24:38.000000000 +0000
@@ -241,6 +241,12 @@
my @find_args = ();
my $files_count = @ARGV;
@@ -72,15 +72,18 @@
$license = "GPL (unversioned/unknown version) $license";
}
-@@ -437,7 +426,7 @@
+@@ -437,9 +426,9 @@
$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 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";
+ }
+
@@ -448,15 +437,21 @@
}
@@ -117,7 +120,12 @@
$license = "Apache (v$1) $license";
}
-@@ -495,7 +492,7 @@
+@@ -491,11 +488,11 @@
+ $license = "CeCILL-$1 $license";
+ }
+
+- if ($licensetext =~ /under the SGI Free Software License B/) {
++ if ($licensetext =~ /under the SGI Free Software (B License|License B)/) {
$license = "SGI Free Software License B $license";
}
Modified: trunk/src/third_party/devscripts/licensecheck.pl
==============================================================================
--- trunk/src/third_party/devscripts/licensecheck.pl (original)
+++ trunk/src/third_party/devscripts/licensecheck.pl Thu Nov 3 05:13:42 2011
@@ -428,7 +428,7 @@
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";
}
@@ -488,7 +488,7 @@
$license = "CeCILL-$1 $license";
}
- if ($licensetext =~ /under the SGI Free Software License B/) {
+ if ($licensetext =~ /under the SGI Free Software (B License|License B)/) {
$license = "SGI Free Software License B $license";
}
Modified: trunk/src/tools/checklicenses/checklicenses.py
==============================================================================
--- trunk/src/tools/checklicenses/checklicenses.py (original)
+++ trunk/src/tools/checklicenses/checklicenses.py Thu Nov 3 05:13:42 2011
@@ -78,6 +78,7 @@
'Public domain',
'libpng',
'zlib/libpng',
+ 'SGI Free Software License B',
]
@@ -117,20 +118,6 @@
'UNKNOWN',
],
- # http://crbug.com/98097
- 'gpu/GLES2': [
- 'UNKNOWN',
- ],
- 'gpu/KHR': [
- 'UNKNOWN',
- ],
- 'gpu/gles2_conform_support/egl/native/EGL': [
- 'UNKNOWN',
- ],
- 'gpu/EGL': [
- 'UNKNOWN',
- ],
-
'native_client': [ # http://crbug.com/98099
'UNKNOWN',
],