diff --git a/Installation/LICENSE b/Installation/LICENSE index 1ba1accba3e1..6babe11444e5 100644 --- a/Installation/LICENSE +++ b/Installation/LICENSE @@ -7,7 +7,7 @@ from GeometryFactory (www.geometryfactory.com) for all or parts of CGAL. The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt5" and "include/CGAL" (with the -exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). +exception of "include/CGAL/CORE"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU General Public License or the GNU Lesser General Public License (as published by the Free Software diff --git a/Maintenance/deb/sid/debian/copyright b/Maintenance/deb/sid/debian/copyright index cede542bb966..382b30cd2b54 100644 --- a/Maintenance/deb/sid/debian/copyright +++ b/Maintenance/deb/sid/debian/copyright @@ -152,7 +152,7 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU General Public License or the GNU Lesser General Public License (as published by the Free Software @@ -168,8 +168,6 @@ Copyright (from upstream file LICENSE) licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -351,26 +349,3 @@ src/CGALimageIO. These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - - -OpenNL -====== - -The following copyright statement applies to the OpenNL library in -include/CGAL/OpenNL. - - Copyright (c) 2005-2008 Inria Loria (France). - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 3 as published by the Free Software Foundation - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Maintenance/deb/squeeze/debian/copyright b/Maintenance/deb/squeeze/debian/copyright index cede542bb966..382b30cd2b54 100644 --- a/Maintenance/deb/squeeze/debian/copyright +++ b/Maintenance/deb/squeeze/debian/copyright @@ -152,7 +152,7 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU General Public License or the GNU Lesser General Public License (as published by the Free Software @@ -168,8 +168,6 @@ Copyright (from upstream file LICENSE) licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -351,26 +349,3 @@ src/CGALimageIO. These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - - -OpenNL -====== - -The following copyright statement applies to the OpenNL library in -include/CGAL/OpenNL. - - Copyright (c) 2005-2008 Inria Loria (France). - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 3 as published by the Free Software Foundation - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Maintenance/deb/wheezy/debian/copyright b/Maintenance/deb/wheezy/debian/copyright index cede542bb966..382b30cd2b54 100644 --- a/Maintenance/deb/wheezy/debian/copyright +++ b/Maintenance/deb/wheezy/debian/copyright @@ -152,7 +152,7 @@ Copyright (from upstream file LICENSE) The source code of the CGAL library can be found in the directories "src/CGAL", "src/CGALQt", "src/CGALQt4" and "include/CGAL" (with the - exception of "include/CGAL/CORE", "include/CGAL/OpenNL"). + exception of "include/CGAL/CORE"). It is specified in each file of the CGAL library which license applies to it. This is either the GNU General Public License or the GNU Lesser General Public License (as published by the Free Software @@ -168,8 +168,6 @@ Copyright (from upstream file LICENSE) licensed under the LGPL (see LICENSE.LGPL). - ImageIO, in the directory "src/CGALimageIO", is licensed under the LGPL (see LICENSE.LGPL). - - OpenNL, in the directory "include/CGAL/OpenNL", is licensed under the LGPL - (see LICENSE.LGPL). All other files that do not have an explicit copyright notice (e.g., all examples and some demos) are licensed under a very permissive license. The @@ -351,26 +349,3 @@ src/CGALimageIO. These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - - -OpenNL -====== - -The following copyright statement applies to the OpenNL library in -include/CGAL/OpenNL. - - Copyright (c) 2005-2008 Inria Loria (France). - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 3 as published by the Free Software Foundation - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/Scripts/developer_scripts/check_licenses b/Scripts/developer_scripts/check_licenses index 84fdc59ff946..13c0f8e14acf 100755 --- a/Scripts/developer_scripts/check_licenses +++ b/Scripts/developer_scripts/check_licenses @@ -43,23 +43,23 @@ EXTENSIONS="C cpp h xpm gif pcx bmp jpeg png txt html vcproj sln dsp dsw cin cou CHECK_PATTERN="\.(`echo $EXTENSIONS | sed -e 's/ /\\|/g'`)" if [ -e $DIR ]; then - echo error: \'$DIR\' exists, this script needs \'$DIR\' for its own purposes - exit 1 + echo error: \'$DIR\' exists, this script needs \'$DIR\' for its own purposes + exit 1 fi mkdir $DIR rm -f $PREFIX1* $PREFIX2* if [ ! -f INSTALL.md ]; then - echo This script should be run from the top-level directory of an internal or external release. - exit 1 + echo This script should be run from the top-level directory of an internal or external release. + exit 1 fi - + licensecheck -r * -c $CHECK_PATTERN | grep -Ev ': L?GPL \(v3 or later\)' | \ - grep -v "^$DIR/\|^include/CGAL/CORE/\|^include/CGAL/OpenNL/\|^src/CGAL_Core/\|^src/CGAL_ImageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts/\|^winutils/\|^cmake/platforms" | sort >$PREFIX1 || true - + grep -v "^$DIR/\|^include/CGAL/CORE/\|^src/CGAL_Core/\|^src/CGAL_ImageIO/\|^config/support/\|test/\|^Packages/\|^developer_scripts/\|^winutils/\|^cmake/platforms" | sort >$PREFIX1 || true + echo Note that files in the following directories are ignored: -echo include/CGAL/CORE, include/CGAL/OpenNL, +echo include/CGAL/CORE, echo src/CGAL_Core, src/CGAL_ImageIO, config/support, echo test, Packages, developer_scripts, doc, winutils @@ -68,8 +68,8 @@ echo Results including examples and demo: echo for EXT in $EXTENSIONS; do - grep -i "\(\.\|/\)$EXT:" $PREFIX1 >$PREFIX1.$EXT || true - echo "$EXT `cat $PREFIX1.$EXT | wc -l`" + grep -i "\(\.\|/\)$EXT:" $PREFIX1 >$PREFIX1.$EXT || true + echo "$EXT `cat $PREFIX1.$EXT | wc -l`" done PATTERN=`echo $EXTENSIONS | sed -e 's/ /\\:\\\\|/g'` @@ -85,8 +85,8 @@ echo grep -v "^examples/\|^demo/" $PREFIX1 >$PREFIX2 || true for EXT in $EXTENSIONS; do - grep -i "\(\.\|/\)$EXT:" $PREFIX2 >$PREFIX2.$EXT || true - echo "$EXT `cat $PREFIX2.$EXT | wc -l`" + grep -i "\(\.\|/\)$EXT:" $PREFIX2 >$PREFIX2.$EXT || true + echo "$EXT `cat $PREFIX2.$EXT | wc -l`" done PATTERN=`echo $EXTENSIONS | sed -e 's/ /\\:\\\\|/g'` @@ -99,12 +99,12 @@ echo echo Detailed results excluding examples and demo: for EXT in $EXTENSIONS; do - if [ `cat $PREFIX2.$EXT | wc -l` -gt 0 ]; then - echo - echo $EXT files - echo - cat $PREFIX2.$EXT - fi + if [ `cat $PREFIX2.$EXT | wc -l` -gt 0 ]; then + echo + echo $EXT files + echo + cat $PREFIX2.$EXT + fi done echo diff --git a/Scripts/scripts/cgal_create_CMakeLists b/Scripts/scripts/cgal_create_CMakeLists index 0dba57221d0b..07e560aee483 100755 --- a/Scripts/scripts/cgal_create_CMakeLists +++ b/Scripts/scripts/cgal_create_CMakeLists @@ -4,7 +4,7 @@ # Utrecht University (The Netherlands), # ETH Zurich (Switzerland), # INRIA Sophia-Antipolis (France), -# Max-Planck-Institute for Informatics Saarbruecken (Germany), +# Max-Planck-Institute for Informatics Saarbruecken (Germany), # and Tel-Aviv University (Israel). All rights reserved. # # This file is part of CGAL (www.cgal.org) @@ -28,7 +28,6 @@ #RS #BLAS #LAPACK -#OPENNL #ESBTL #NTL @@ -67,7 +66,7 @@ create_cmake_script_with_options() next_boost_component=`echo $LINE | grep -v "#" | grep BOOST_COMPONENT` if [ ! -z "$next_boost_component" ]; then next_boost_component=${next_boost_component/BOOST_COMPONENT /} - if [ -z "$BOOST_COMPONENTS" ]; then + if [ -z "$BOOST_COMPONENTS" ]; then BOOST_COMPONENTS=$next_boost_component else BOOST_COMPONENTS=$BOOST_COMPONENTS":"$next_boost_component @@ -92,7 +91,7 @@ EOF #--------------------------------------------------------------------------- if [ "$SINGLE_SOURCE" = "n" ]; then echo "project( ${PROJECT} )" - else + else echo "project( ${SOURCE} )" fi @@ -124,7 +123,6 @@ fi CGAL_COMPONENTS=${CGAL_COMPONENTS//[m|M][p|P][f|F][i|I]/MPFI} CGAL_COMPONENTS=${CGAL_COMPONENTS//[r|R][s|S]/RS} - CGAL_COMPONENTS=${CGAL_COMPONENTS//[o|O][p|P][e|E][n|N][n|N][l|L]/OpenNL} CGAL_COMPONENTS=${CGAL_COMPONENTS//[b|B][l|L][a|A][s|S]/BLAS} CGAL_COMPONENTS=${CGAL_COMPONENTS//[l|L][a|A][p|P][a|A][c|C][k|K]/LAPACK} @@ -161,7 +159,7 @@ fi if ( NOT CGAL_FOUND ) message(STATUS "This project requires the CGAL library, and will not be compiled.") - return() + return() endif() @@ -192,7 +190,7 @@ if ( NOT Boost_FOUND ) message(STATUS "This project requires the Boost library, and will not be compiled.") - return() + return() endif() EOF @@ -208,7 +206,7 @@ EOF if [ -d include ] ; then echo 'include_directories( BEFORE include )' - fi + fi #vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv cat << 'EOF' @@ -304,9 +302,9 @@ EOF fi fi #add a new line - echo + echo done - + else #====================================================================== ################# diff --git a/Solver_interface/doc/Solver_interface/Solver_interface.txt b/Solver_interface/doc/Solver_interface/Solver_interface.txt index 8b3450f8afc1..e4a491e882f5 100644 --- a/Solver_interface/doc/Solver_interface/Solver_interface.txt +++ b/Solver_interface/doc/Solver_interface/Solver_interface.txt @@ -125,7 +125,7 @@ This package is the result of the increasing needs for linear solvers in \cgal. The first packages that introduced the solver concepts were \ref PkgSurfaceMeshParameterization, \ref PkgPoissonSurfaceReconstruction3 and \ref PkgJetFitting3. At that time, these packages were relying -on \taucs, \lapack, \blas and \opennl. Gaël Guennebaud +on \taucs, \lapack, \blas and OpenNL. Gaël Guennebaud then introduced new models using the \ref thirdpartyEigen library that became the only supported models by \cgal. Later on the packages \ref PkgSurfaceMeshSkeletonization and \ref PkgSurfaceMeshDeformation diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt index c4be5d3c0fb1..636b49d2523f 100644 --- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt +++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt @@ -547,6 +547,7 @@ and replaces a wrapper which had a more complicated API. Iterative authalic parameterization was added in CGAL 5.2 by Mael Rouxel-Labbé, based on a prototype developed by Hardik Jain. +In CGAL 6.0 the fork of OpenNL that was distributed with CGAL was removed. + */ } /* namespace CGAL */ -