phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno

Browse Source
This commit is contained in:
Maxime Gimeno
2021-01-07 15:05:28 +01:00
parent 0a12aff2ac 9c0fb12ab2
commit 3d1c41fd14
154 changed files with 6889 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/developer_scripts/detect_packages_licenses
+6 -4
View File
@@ -5,14 +5,15 @@
# */package_info/*/license.txt
setopt extendedglob
for p in ^*build*(/); do
if [ -d $p/include ]; then
OLD_LOCALE=$(locale | grep COLLATE | cut -d= -f2)
export LC_COLLATE="en_US.UTF-8"
for p in ^*build*(/); do
if [ -d $p/include ]; then
licFile=$p/package_info/$p/license.txt
l=`licensecheck -r $p/include $p/src | awk -F': ' '{print $2}' | grep -v BSL | sed -e 's/ *GENERATED FILE//' | sort -u`
if [ "x`echo $l | wc -l`" = "x1" ]; then
echo $l > "$licFile"
elif [ -z "`echo $l | grep -Ev '^L?GPL \(v3 or later\) *$'`" ]; then
elif [ -z "`echo $l | grep -Ev '^L?GPL \(v3 or later\) *$'`" ]; then
echo 'GPL (v3 or later)' > "$licFile"
else
# echo "MULTIPLE!" > "$licFile";
@@ -20,3 +21,4 @@ for p in ^*build*(/); do
fi
fi
done
export LC_COLLATE=$OLD_LOCALE
Scripts/developer_scripts/licensecheck
+11 -1
View File
@@ -444,6 +444,10 @@ sub parselicense {
$license = "GENERATED FILE";
}
if ($licensetext =~ /This file incorporates work covered by the following copyright and permission notice/i) {
$license = "DERIVED WORK";
}
if ($licensetext =~ /((is free software.? )?you can redistribute (it|them) and\/or modify (it|them)|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) {
$license = "LGPL$gplver$extrainfo $license";
}
@@ -576,12 +580,14 @@ sub parselicense {
}
# Since SPDX tags are sufficient, make sure no license notice was present
if (length($license)!=0 && $license ne "GENERATED FILE")
if (length($license)!=0 && $license ne "GENERATED FILE" && !($license =~ "DERIVED WORK"))
{
$license = $license." READ FROM LICENSE NOTICE THAT SHOULD NOT BE PRESENT";
}
else
{
$license="";
if ($licensetext =~ /SPDX-License-Identifier GPL-3.0-or-later/i) {
$license = "GPL (v3 or later)";
}
@@ -601,6 +607,10 @@ sub parselicense {
if ($licensetext =~ /SPDX-License-Identifier LicenseRef-RFL/i) {
$license = "MIT/X11 (BSD like)";
}
if ($licensetext =~ /SPDX-License-Identifier \( GPL-3.0-or-later OR LicenseRef-Commercial \) AND MIT/i) {
$license = "GPL (v3 or later) AND MIT/X11 (BSD like)";
}
}
$license = "UNKNOWN" if (!length($license));