mirror of https://github.com/CGAL/cgal
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:
commit
e10ace6bcf
|
|
@ -1,15 +1,13 @@
|
|||
// This header file is a copy of "boost/config/auto_link.hpp"
|
||||
// from boost version 1.44.0
|
||||
// but slightly modified to accommodate CGAL libraries.
|
||||
|
||||
//
|
||||
// Before CGAL-4.7-beta1, it has been synchronized with
|
||||
// libs/config/ version boost-1.58.0-39-g15d56c9, file
|
||||
// include/boost/config/auto_link.hpp
|
||||
|
||||
//
|
||||
// (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$
|
||||
// $Id$
|
||||
|
|
|
|||
|
|
@ -1,15 +1,6 @@
|
|||
// Copyright (c) 2012 GeometryFactory Sarl (France)
|
||||
// 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$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: BSL-1.0
|
||||
|
|
|
|||
|
|
@ -594,6 +594,10 @@ sub parselicense {
|
|||
$license = "LGPL (v3)";
|
||||
}
|
||||
|
||||
if ($licensetext =~ /SPDX-License-Identifier BSL-1.0/i) {
|
||||
$license = "BSL 1.0";
|
||||
}
|
||||
|
||||
if ($licensetext =~ /SPDX-License-Identifier LicenseRef-RFL/i) {
|
||||
$license = "MIT/X11 (BSD like)";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
//
|
||||
// $URL$
|
||||
// $Id$
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
|
||||
//
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue