Support dual licensing under MIT and the University of Illinois/NCSA

third_party/devscripts/licensecheck.pl

Index: third_party/devscripts/licensecheck.pl
===================================================================
--- third_party/devscripts/licensecheck.pl	(revision 241818)
+++ third_party/devscripts/licensecheck.pl	(working copy)
@@ -497,6 +497,10 @@
 	$license = "University of Illinois/NCSA Open Source License (BSD like) $license";
     }
 
+    if ($licensetext  =~ /This file is dual licensed under the MIT and the University of Illinois Open Source License/){
+	$license = "dual license: MIT | University of Illinois/NCSA Open Source License (BSD like) $license";

[Paweł Hajdan Jr., 2013/12/20 08:26:09]

There's no need to include "dual license" in the text.

Let's do this: change above regex to only say "the University of Illinois Open
Source License"

Then for this make it match on "under the MIT .* License" (and place it near
existing MIT regex.

Does it make sense?

Please note that indeed I'd prefer a more precise identification, e.g. whether
it's OR or AND between the licenses. However, this regex-based approach is
inherently imprecise anyway, and only serves a secondary role.

At Google we rely primarily on OSPO review. This automated license check is
mostly for other Open Source projects using our codebase.

[Alexander Potapenko, 2013/12/20 08:39:44]

Removed "dual license". 
Not sure I understand. Do you mean set $license to "the University of Illinois
Open Source License", or use that string in the regex match 
Am I understanding you right (see patch set 2)?
As a result, licensecheck.pl generates the following license for a libc++ file:

'third_party/libc++/trunk/src/hash.cpp' has non-whitelisted license 'University
of Illinois/NCSA Open Source License (BSD like) MIT'

Shall I add this line to checklicenses.py?
Overall, looks like licensecheck.pl simply concatenates the licenses it finds in
the source file, so one has to whitelist their concatenation in exactly the same
order the checks are performed. I'm ok with that, but it's kind of ugly.

+    }
+
     if ($licensetext  =~ /Permission to use, copy, modify, and(\/or)? distribute this software (and its documentation )?for any purpose (with or )?without fee is hereby granted, provided.*(copyright|entire) notice.*all copies/i) {
 	$license = "ISC $license";
     }