Merge pull request #4303 from sloriot/CGAL-SPDX_updates

Update SPDX tags

Scripts/developer_scripts/check_licenses

@@ -7,20 +7,11 @@
 # and Tel-Aviv University (Israel).  All rights reserved.
 # Copyright (c) 2012 GeometryFactory Sarl (France)
 #
-# This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# Licensees holding a valid commercial license may use this file in
-# accordance with the commercial license agreement provided with the software.
-#
-# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# This file is part of CGAL (www.cgal.org)
 #
 # $URL$
 # $Id$
-# SPDX-License-Identifier: LGPL-3.0+
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #
 # Author(s)     : Joachim Reichel <joachim.reichel@gmx.de>
 #                 Laurent Rineau

Scripts/developer_scripts/create_internal_release

@@ -281,7 +281,7 @@ sub create_version_file()
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// SPDX-License-Identifier: LGPL-3.0+
+// SPDX-License-Identifier: LGPL-3.0-or-later
 //
 // Author(s)     : -
 

Scripts/developer_scripts/licensecheck

@@ -6,20 +6,7 @@
 #   Copyright (C) 2007, 2008 Adam D. Barratt
 #   Copyright (C) 2012 Francesco Poli
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# SPDX-License-Identifier: LGPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 =head1 NAME
@@ -588,6 +575,30 @@ sub parselicense {
         $license = "WTFPL $license";
     }
 
+    # Since SPDX tags are sufficient, make sure no license notice was present
+    if (length($license)!=0 && $license ne "GENERATED FILE")
+    {
+      $license = $license." READ FROM LICENSE NOTICE THAT SHOULD NOT BE PRESENT";
+    }
+    else
+    {
+      if ($licensetext =~ /SPDX-License-Identifier GPL-3.0-or-later/i) {
+        $license = "GPL (v3 or later)";
+      }
+
+      if ($licensetext =~ /SPDX-License-Identifier LGPL-3.0-or-later/i) {
+        $license = "LGPL (v3 or later)";
+      }
+
+      if ($licensetext =~ /SPDX-License-Identifier LGPL-3.0-only/i) {
+        $license = "LGPL (v3)";
+      }
+
+      if ($licensetext =~ /SPDX-License-Identifier LicenseRef-RFL/i) {
+        $license = "MIT/X11 (BSD like)";
+      }
+    }
+
     $license = "UNKNOWN" if (!length($license));
 
     # Remove trailing spaces.

Scripts/developer_scripts/list_cgal_includes

@@ -6,20 +6,11 @@
 # Max-Planck-Institute Saarbruecken (Germany),
 # and Tel-Aviv University (Israel).  All rights reserved.
 #
-# This file is part of CGAL (www.cgal.org); you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; version 3 of the License,
-# or (at your option) any later version.
-#
-# Licensees holding a valid commercial license may use this file in
-# accordance with the commercial license agreement provided with the software.
-#
-# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# This file is part of CGAL (www.cgal.org)
 #
 # $URL$
 # $Id$
-# SPDX-License-Identifier: LGPL-3.0+
+# SPDX-License-Identifier: LGPL-3.0-or-later
 #
 # Author(s)     : 
 

Scripts/developer_scripts/test_license_check/ImageIO.h

@@ -16,7 +16,7 @@
 // $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/releases/CGAL-4.1-branch/CGALimageIO/include/CGAL/ImageIO.h $
 // $Id: ImageIO.h 67097 2012-01-13 13:36:56Z lrineau $
 //
-// SPDX-License-Identifier: LGPL-3.0+
+// SPDX-License-Identifier: LGPL-3.0-or-later
 //
 
 #ifndef IMAGEIO_H

Scripts/developer_scripts/test_license_check/min_dihedral_angle.h

@@ -2,19 +2,10 @@
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org).
-// You can redistribute it and/or modify it under the terms of the GNU
-// General Public License as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
 // $URL$
 // $Id$
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s)     : Laurent RINEAU, Stephane Tayeb
 

Scripts/developer_scripts/test_license_check/test-gpl.h

@@ -2,15 +2,4 @@
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org).
-// You can redistribute it and/or modify it under the terms of the GNU
-// General Public License as published by the Free Software Foundation,
-// either version 3 of the License, or (at your option) any later version.
-//
-// Licensees holding a valid commercial license may use this file in
-// accordance with the commercial license agreement provided with the software.
-//
-// SPDX-License-Identifier: GPL-3.0+
-//
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //

Scripts/developer_scripts/test_license_check/test-lgpl.h

@@ -16,5 +16,5 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// SPDX-License-Identifier: LGPL-3.0+
+// SPDX-License-Identifier: LGPL-3.0-or-later
 //