Merge remote-tracking branch 'cgal/master' into CMake-modernization-maxGimeno

Scripts/developer_scripts/cgal_create_release_with_cmake.cmake

@@ -158,6 +158,8 @@ if(EXISTS ${GIT_REPO}/Maintenance/release_building/public_release_name)
   file(COPY "${GIT_REPO}/Maintenance/release_building/public_release_name"
     DESTINATION "${release_dir}/doc")
 endif()
+file(COPY ${GIT_REPO}/GraphicsView/demo/resources ${GIT_REPO}/GraphicsView/demo/icons
+  DESTINATION "${release_dir}/cmake/modules/demo")
 
 #create VERSION
 file(WRITE ${release_dir}/VERSION "${CGAL_VERSION}")

Scripts/developer_scripts/detect_packages_licenses

@@ -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

@@ -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));

Scripts/developer_scripts/merge_pr_with_label

@@ -9,7 +9,7 @@ fi
 
 for pr in $(python3 ./Scripts/developer_scripts/list_pull_requests.py "$1" --unmerged); do
     if ! hub merge $pr; then
-        echo $p;
+        echo $pr;
         break
     fi
 done

Scripts/developer_scripts/test_merge_of_branch

@@ -155,7 +155,7 @@ fi
 
 #check no file contains non-utf8 characters
 echo '.. Checking if non utf-8 characters are used...'
-txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\0", $2; }' | xargs -0 file -N | grep "text" | egrep -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex")
+txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\n", $2; }' | xargs file -N | grep "text" | egrep -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex")
 if [ -n "${txt_not_utf8}" ]; then
   echo "The following files have non utf-8 characters:"
   echo ${txt_not_utf8}