diff --git a/.travis.yml b/.travis.yml index 2c2fe62d3f4..80064ff1602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,36 +23,35 @@ env: - PACKAGE='Homogeneous_kernel Hyperbolic_triangulation_2 Inscribed_areas ' - PACKAGE='Installation Interpolation Intersections_2 ' - PACKAGE='Intersections_3 Interval_skip_list Interval_support ' - - PACKAGE='Inventor Jet_fitting_3 Kernel_23 ' - - PACKAGE='Kernel_d LEDA Linear_cell_complex ' - - PACKAGE='MacOSX Maintenance Matrix_search ' - - PACKAGE='Mesh_2 Mesh_3 Mesher_level ' - - PACKAGE='Minkowski_sum_2 Minkowski_sum_3 Modifier ' - - PACKAGE='Modular_arithmetic Nef_2 Nef_3 ' - - PACKAGE='Nef_S2 NewKernel_d Number_types ' - - PACKAGE='OpenNL Optimal_bounding_box Optimal_transportation_reconstruction_2 ' - - PACKAGE='Optimisation_basic Partition_2 Periodic_2_triangulation_2 ' - - PACKAGE='Periodic_3_mesh_3 Periodic_3_triangulation_3 Periodic_4_hyperbolic_triangulation_2 ' - - PACKAGE='Point_set_2 Point_set_3 Point_set_processing_3 ' - - PACKAGE='Poisson_surface_reconstruction_3 Polygon Polygon_mesh_processing ' - - PACKAGE='Polygonal_surface_reconstruction Polyhedron Polyhedron_IO ' - - PACKAGE='Polyline_simplification_2 Polynomial Polytope_distance_d ' - - PACKAGE='Principal_component_analysis Principal_component_analysis_LGPL Profiling_tools ' - - PACKAGE='Property_map QP_solver Random_numbers ' - - PACKAGE='Ridges_3 STL_Extension Scale_space_reconstruction_3 ' - - PACKAGE='Scripts SearchStructures Segment_Delaunay_graph_2 ' - - PACKAGE='Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 Shape_detection ' - - PACKAGE='Skin_surface_3 Snap_rounding_2 Solver_interface ' - - PACKAGE='Spatial_searching Spatial_sorting Straight_skeleton_2 ' - - PACKAGE='Stream_lines_2 Stream_support Subdivision_method_3 ' - - PACKAGE='Surface_mesh Surface_mesh_approximation Surface_mesh_deformation ' - - PACKAGE='Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path ' - - PACKAGE='Surface_mesh_simplification Surface_mesh_skeletonization Surface_mesh_topology ' - - PACKAGE='Surface_mesher Surface_sweep_2 TDS_2 ' - - PACKAGE='TDS_3 Testsuite Tetrahedral_remeshing ' - - PACKAGE='Three Triangulation Triangulation_2 ' - - PACKAGE='Triangulation_3 Union_find Visibility_2 ' - - PACKAGE='Voronoi_diagram_2 wininst ' + - PACKAGE='Jet_fitting_3 Kernel_23 Kernel_d ' + - PACKAGE='LEDA Linear_cell_complex MacOSX ' + - PACKAGE='Maintenance Matrix_search Mesh_2 ' + - PACKAGE='Mesh_3 Mesher_level Minkowski_sum_2 ' + - PACKAGE='Minkowski_sum_3 Modifier Modular_arithmetic ' + - PACKAGE='Nef_2 Nef_3 Nef_S2 ' + - PACKAGE='NewKernel_d Number_types OpenNL ' + - PACKAGE='Optimal_bounding_box Optimal_transportation_reconstruction_2 Optimisation_basic ' + - PACKAGE='Partition_2 Periodic_2_triangulation_2 Periodic_3_mesh_3 ' + - PACKAGE='Periodic_3_triangulation_3 Periodic_4_hyperbolic_triangulation_2 Point_set_2 ' + - PACKAGE='Point_set_3 Point_set_processing_3 Poisson_surface_reconstruction_3 ' + - PACKAGE='Polygon Polygon_mesh_processing Polygonal_surface_reconstruction ' + - PACKAGE='Polyhedron Polyline_simplification_2 Polynomial ' + - PACKAGE='Polytope_distance_d Principal_component_analysis Principal_component_analysis_LGPL ' + - PACKAGE='Profiling_tools Property_map QP_solver ' + - PACKAGE='Random_numbers Ridges_3 STL_Extension ' + - PACKAGE='Scale_space_reconstruction_3 Scripts SearchStructures ' + - PACKAGE='Segment_Delaunay_graph_2 Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 ' + - PACKAGE='Shape_detection Skin_surface_3 Snap_rounding_2 ' + - PACKAGE='Solver_interface Spatial_searching Spatial_sorting ' + - PACKAGE='Straight_skeleton_2 Stream_lines_2 Stream_support ' + - PACKAGE='Subdivision_method_3 Surface_mesh Surface_mesh_approximation ' + - PACKAGE='Surface_mesh_deformation Surface_mesh_parameterization Surface_mesh_segmentation ' + - PACKAGE='Surface_mesh_shortest_path Surface_mesh_simplification Surface_mesh_skeletonization ' + - PACKAGE='Surface_mesh_topology Surface_mesher Surface_sweep_2 ' + - PACKAGE='TDS_2 TDS_3 Testsuite ' + - PACKAGE='Tetrahedral_remeshing Three Triangulation ' + - PACKAGE='Triangulation_2 Triangulation_3 Union_find ' + - PACKAGE='Visibility_2 Voronoi_diagram_2 wininst ' compiler: clang install: - echo "$PWD" diff --git a/.travis/packages.txt b/.travis/packages.txt index 6e75cd0ad14..b4874d76f4a 100644 --- a/.travis/packages.txt +++ b/.travis/packages.txt @@ -49,7 +49,6 @@ Intersections_2 Intersections_3 Interval_skip_list Interval_support -Inventor Jet_fitting_3 Kernel_23 Kernel_d @@ -87,7 +86,6 @@ Polygon Polygon_mesh_processing Polygonal_surface_reconstruction Polyhedron -Polyhedron_IO Polyline_simplification_2 Polynomial Polytope_distance_d diff --git a/Polyhedron/doc/Polyhedron/Doxyfile.in b/Polyhedron/doc/Polyhedron/Doxyfile.in index 45cbd9c4279..fa4344c40fc 100644 --- a/Polyhedron/doc/Polyhedron/Doxyfile.in +++ b/Polyhedron/doc/Polyhedron/Doxyfile.in @@ -1,4 +1,2 @@ @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} - PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Polyhedral Surface" -EXAMPLE_PATH += ${CGAL_Polyhedron_IO_EXAMPLE_DIR} diff --git a/Polyhedron/doc/Polyhedron/Polyhedron.txt b/Polyhedron/doc/Polyhedron/Polyhedron.txt index 08c6902f8fe..4dcef22d407 100644 --- a/Polyhedron/doc/Polyhedron/Polyhedron.txt +++ b/Polyhedron/doc/Polyhedron/Polyhedron.txt @@ -366,13 +366,6 @@ Section \ref sectionPolyIntro. For more information, you can see the \ref IOstreamPolygonMeshIO section. -Some example programs around the different file formats are provided -in the distribution under examples/Polyhedron_IO/ and -demo/Polyhedron_IO/. We show an example converting OFF input -into VRML 1.0 output. - -\cgalExample{Polyhedron/polyhedron2vrml.cpp} - \section PolyhedronExtending Extending Vertices, Halfedges, and Facets \anchor sectionPolyExtend diff --git a/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h b/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h deleted file mode 100644 index 03400704c27..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/OBJ_reader.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2016 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Andreas Fabri and Maxime Gimeno - -#ifndef CGAL_IO_OBJ_READER_H -#define CGAL_IO_OBJ_READER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_OBJ_READER_H diff --git a/Polyhedron_IO/include/CGAL/IO/OFF_reader.h b/Polyhedron_IO/include/CGAL/IO/OFF_reader.h deleted file mode 100644 index 3f8f73830f5..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/OFF_reader.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2015 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Laurent Rineau and Sebastien Loriot - -#ifndef CGAL_IO_OFF_READER_H -#define CGAL_IO_OFF_READER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_OFF_READER_H diff --git a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h b/Polyhedron_IO/include/CGAL/IO/PLY_reader.h deleted file mode 100644 index 59536a33d67..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/PLY_reader.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2017 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Simon Giraudot - -#ifndef CGAL_IO_PLY_READER_H -#define CGAL_IO_PLY_READER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_PLY_READER_H diff --git a/Polyhedron_IO/include/CGAL/IO/PLY_writer.h b/Polyhedron_IO/include/CGAL/IO/PLY_writer.h deleted file mode 100644 index 1ee55abe953..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/PLY_writer.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2017 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Simon Giraudot - -#ifndef CGAL_IO_PLY_WRITER_H -#define CGAL_IO_PLY_WRITER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_PLY_WRITER_H diff --git a/Polyhedron_IO/include/CGAL/IO/STL_reader.h b/Polyhedron_IO/include/CGAL/IO/STL_reader.h deleted file mode 100644 index 7aec56e9c40..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/STL_reader.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2015 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Andreas Fabri, -// Mael Rouxel-Labbé - -#ifndef CGAL_IO_STL_READER_H -#define CGAL_IO_STL_READER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_STL_READER_H diff --git a/Polyhedron_IO/include/CGAL/IO/STL_writer.h b/Polyhedron_IO/include/CGAL/IO/STL_writer.h deleted file mode 100644 index b4a0578b967..00000000000 --- a/Polyhedron_IO/include/CGAL/IO/STL_writer.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2017 GeometryFactory -// -// This file is part of CGAL (www.cgal.org) -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s) : Sebastien Loriot - -#ifndef CGAL_IO_STL_WRITER_H -#define CGAL_IO_STL_WRITER_H - -#define CGAL_DEPRECATED_HEADER "" -#define CGAL_REPLACEMENT_HEADER "" -#include - -#include - -#endif // CGAL_IO_STL_WRITER_H diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies deleted file mode 100644 index b8678f37e1c..00000000000 --- a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies +++ /dev/null @@ -1,20 +0,0 @@ -Algebraic_foundations -BGL -Circulator -Distance_2 -Geomview -HalfedgeDS -Hash_map -Installation -Interval_support -Inventor -Kernel_23 -Modifier -Modular_arithmetic -Number_types -Polyhedron -Polyhedron_IO -Profiling_tools -Property_map -STL_Extension -Stream_support diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/description.txt b/Polyhedron_IO/package_info/Polyhedron_IO/description.txt deleted file mode 100644 index 81ca5a01601..00000000000 --- a/Polyhedron_IO/package_info/Polyhedron_IO/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -File IO for CGAL::Polyhedron_3. - -This package is fully deprecated in favor of I/O functions in the packages BGL, Polyhedron, and Stream_support. diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/license.txt b/Polyhedron_IO/package_info/Polyhedron_IO/license.txt deleted file mode 100644 index 8bb8efcb72b..00000000000 --- a/Polyhedron_IO/package_info/Polyhedron_IO/license.txt +++ /dev/null @@ -1 +0,0 @@ -GPL (v3 or later) diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/maintainer b/Polyhedron_IO/package_info/Polyhedron_IO/maintainer deleted file mode 100644 index 7e028c78627..00000000000 --- a/Polyhedron_IO/package_info/Polyhedron_IO/maintainer +++ /dev/null @@ -1 +0,0 @@ -cgal-develop diff --git a/Scripts/developer_scripts/add_license_in_pkg_header.py b/Scripts/developer_scripts/add_license_in_pkg_header.py index a093373654a..b5bb60ea2a8 100644 --- a/Scripts/developer_scripts/add_license_in_pkg_header.py +++ b/Scripts/developer_scripts/add_license_in_pkg_header.py @@ -3,7 +3,7 @@ # Insert in all the header file of a package the include directive # "#include