songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4334 from sloriot/CGAL-SPDX_cleanup_fixes 

Fix some remaining license notice + add a missing LicenseRef-Commercial
This commit is contained in:
Laurent Rineau 2019-11-06 17:45:23 +01:00
parent d7afe19942 0d4963f455
commit e10ace6bcf
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Installation/include/CGAL/auto_link/auto_link.h
View File

@ -1,15 +1,13 @@
// This header file is a copy of "boost/config/auto_link.hpp" // This header file is a copy of "boost/config/auto_link.hpp"
// from boost version 1.44.0 // from boost version 1.44.0
// but slightly modified to accommodate CGAL libraries. // but slightly modified to accommodate CGAL libraries.
//
// Before CGAL-4.7-beta1, it has been synchronized with // Before CGAL-4.7-beta1, it has been synchronized with
// libs/config/ version boost-1.58.0-39-g15d56c9, file // libs/config/ version boost-1.58.0-39-g15d56c9, file
// include/boost/config/auto_link.hpp // include/boost/config/auto_link.hpp
//
// (C) Copyright John Maddock 2003. // (C) Copyright John Maddock 2003.
// Use, modification and distribution are subject to the //
// Boost Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
// //
// $URL$ // $URL$
// $Id$ // $Id$

9
STL_Extension/include/CGAL/is_streamable.h
View File

@ -1,15 +1,6 @@
// Copyright (c) 2012 GeometryFactory Sarl (France) // Copyright (c) 2012 GeometryFactory Sarl (France)
// All rights reserved. // All rights reserved.
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
//
// 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$ // $URL$
// $Id$ // $Id$
// SPDX-License-Identifier: BSL-1.0 // SPDX-License-Identifier: BSL-1.0

4
Scripts/developer_scripts/licensecheck
View File

@ -594,6 +594,10 @@ sub parselicense {
$license = "LGPL (v3)"; $license = "LGPL (v3)";
} }
if ($licensetext =~ /SPDX-License-Identifier BSL-1.0/i) {
$license = "BSL 1.0";
}
if ($licensetext =~ /SPDX-License-Identifier LicenseRef-RFL/i) { if ($licensetext =~ /SPDX-License-Identifier LicenseRef-RFL/i) {
$license = "MIT/X11 (BSD like)"; $license = "MIT/X11 (BSD like)";
} }

2
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
View File

@ -6,7 +6,7 @@
// //
// $URL$ // $URL$
// $Id$ // $Id$
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
// //