Merge branch '5.3.x-branch'

This commit is contained in:
Laurent Rineau 2021-09-20 17:07:24 +02:00
commit cb5cb46b5f
1 changed files with 42 additions and 39 deletions

View File

@ -1,51 +1,54 @@
#!/bin/zsh
set -e
# old demos, to ignore
rm -rf Convex_hull_3_Demo
rm -rf Convex_hull_d_Demo
rm -rf GraphicsView_Demo
rm -rf Geomview_Demo
rm -rf Mesh_2_Demo
rm -rf Polyhedron_IO_Demo
rm -rf Interpolation_Demo
rm -rf Triangulation_3_Geomview_demos_Demo
rm -rf GraphicsView_Demo_with_dlls
rm -rf Geomview_Demo_with_dlls
rm -rf Mesh_2_Demo_with_dlls
rm -rf Interpolation_Demo_with_dlls
rm -rf Triangulation_3_Geomview_demos_Demo_with_dlls
# Demo to ignore (in favor of Polyhedron)
rm -rf Circular_kernel_3_Demo_with_dlls
rm -rf Surface_mesh_deformation_Demo_with_dlls
# CGAL<=3.7
pushd AABB_tree_Demo_with_dlls; zip ../AABB_demo.zip * ; popd
pushd Alpha_shapes_3_Demo_with_dlls; zip ../alpha_shape_3.zip * ; popd
pushd Bounding_volumes_Demo_with_dlls; zip ../bounding_volumes_2.zip * ; popd
pushd Circular_kernel_2_Demo_with_dlls; zip ../circular_kernel.zip * ; popd
pushd Periodic_3_triangulation_3_Demo_with_dlls; zip ../periodic_3_triangulation_3.zip *; popd
pushd Periodic_Lloyd_3_Demo_with_dlls; zip ../periodic_3_lloyd.zip *; popd
pushd AABB_tree_Demo_with_dlls; zip -r ../AABB_demo.zip * ; popd
pushd Alpha_shapes_3_Demo_with_dlls; zip -r ../alpha_shape_3.zip * ; popd
pushd Bounding_volumes_Demo_with_dlls; zip -r ../bounding_volumes_2.zip * ; popd
pushd Circular_kernel_2_Demo_with_dlls; zip -r ../circular_kernel.zip * ; popd
pushd Periodic_3_triangulation_3_Demo_with_dlls; zip -r ../periodic_3_triangulation_3.zip *; popd
pushd Periodic_Lloyd_3_Demo_with_dlls; zip -r ../periodic_3_lloyd.zip *; popd
pushd Polyhedron_Demo_with_dlls; zip -r ../polyhedron_3.zip * ; popd
pushd Segment_Delaunay_graph_2_Demo_with_dlls; zip ../segment_voronoi_diagram_2.zip *; popd
pushd Surface_mesher_Demo_with_dlls; zip ../surface_mesher.zip *; popd
pushd Segment_Delaunay_graph_2_Demo_with_dlls; zip -r ../segment_voronoi_diagram_2.zip *; popd
#pushd Surface_mesher_Demo_with_dlls; zip -r ../surface_mesher.zip *; popd
pushd Triangulation_2_Demo_with_dlls;
zip ../regular_triangulation_2.zip Regular_triangulation_2.exe *.dll platforms;
zip ../constrained_delaunay_triangulation_2.zip Constrained_Delaunay_triangulation_2.exe *.dll platforms;
zip ../delaunay_triangulation_2.zip Delaunay_triangulation_2.exe *.dll platforms;
zip -r ../regular_triangulation_2.zip Regular_triangulation_2.exe *.dll platforms;
zip -r ../constrained_delaunay_triangulation_2.zip Constrained_Delaunay_triangulation_2.exe *.dll platforms;
zip -r ../delaunay_triangulation_2.zip Delaunay_triangulation_2.exe *.dll platforms;
popd
# CGAL-3.8
pushd Largest_empty_rect_2_Demo_with_dlls; zip ../largest_empty_rect_2.zip *; popd
pushd Apollonius_graph_2_Demo_with_dlls; zip ../apollonius_graph_2.zip *; popd
pushd Stream_lines_2_Demo_with_dlls; zip ../streamlines.zip *; popd
pushd Triangulation_3_Demo_with_dlls; zip ../triangulation_3.zip *; popd
#pushd Circular_kernel_3_Demo_with_dlls; zip ../triangulation_3.zip *; popd
pushd Alpha_shapes_2_Demo_with_dlls; zip ../alpha_shapes_2.zip *; popd
pushd Generator_Demo_with_dlls; zip ../generator.zip *; popd
pushd L1_Voronoi_diagram_2_Demo_with_dlls; zip ../l1_voronoi_diagram_2.zip *; popd
pushd Snap_rounding_2_Demo_with_dlls; zip ../snap_rounding_2.zip *; popd
pushd Spatial_searching_2_Demo_with_dlls; zip ../spatial_searching.zip *; popd
pushd Largest_empty_rect_2_Demo_with_dlls; zip -r ../largest_empty_rect_2.zip *; popd
pushd Apollonius_graph_2_Demo_with_dlls; zip -r ../apollonius_graph_2.zip *; popd
pushd Stream_lines_2_Demo_with_dlls; zip -r ../streamlines.zip *; popd
pushd Triangulation_3_Demo_with_dlls; zip -r ../triangulation_3.zip *; popd
#pushd Circular_kernel_3_Demo_with_dlls; zip -r ../triangulation_3.zip *; popd
pushd Alpha_shapes_2_Demo_with_dlls; zip -r ../alpha_shapes_2.zip *; popd
pushd Generator_Demo_with_dlls; zip -r ../generator.zip *; popd
pushd L1_Voronoi_diagram_2_Demo_with_dlls; zip -r ../l1_voronoi_diagram_2.zip *; popd
pushd Snap_rounding_2_Demo_with_dlls; zip -r ../snap_rounding_2.zip *; popd
pushd Spatial_searching_2_Demo_with_dlls; zip -r ../spatial_searching.zip *; popd
# CGAL-4.0
pushd Linear_cell_complex_Demo_with_dlls; zip ../linear_cell_complex_3.zip *; popd
pushd Linear_cell_complex_Demo_with_dlls; zip -r ../linear_cell_complex_3.zip *; popd
# CGAL-4.2 but was forgot -> published with 4.3
pushd Arrangement_on_surface_2_Demo_with_dlls; zip ../arrangements_2.zip *; popd
pushd Arrangement_on_surface_2_Demo_with_dlls; zip -r ../arrangements_2.zip *; popd
# CGAL-4.5
pushd Periodic_2_triangulation_2_Demo_with_dlls; zip ../Periodic_2_Delaunay_triangulation_2.zip *;
pushd Periodic_2_triangulation_2_Demo_with_dlls; zip -r ../Periodic_2_Delaunay_triangulation_2.zip *;
popd
# probably an error, in CGAL-4.5:
rm -rf Surface_mesh_deformation_Demo
@ -54,18 +57,18 @@ rm -rf Surface_mesh_deformation_Demo
rm -rf Circular_kernel_3_Demo
# CGAL-4.6
pushd Polyline_simplification_2_Demo_with_dlls; zip ../polyline_simplification_2.zip *; popd
pushd Polyline_simplification_2_Demo_with_dlls; zip -r ../polyline_simplification_2.zip *; popd
# CGAL-4.7
pushd Segment_Delaunay_graph_Linf_2_Demo_with_dlls; zip ../segment_voronoi_diagram_2.zip *; popd
pushd Segment_Delaunay_graph_Linf_2_Demo_with_dlls; zip -r ../segment_voronoi_diagram_2.zip *; popd
# CGAL-4.8
pushd Optimal_transportation_reconstruction_2_Demo_with_dlls; zip ../otr2.zip *; popd
pushd Optimal_transportation_reconstruction_2_Demo_with_dlls; zip -r ../otr2.zip *; popd
#missing demos
pushd Polygon_Demo_with_dlls; zip ../polygon.zip *; popd
pushd Principal_component_analysis_Demo_with_dlls; zip ../pca.zip *; popd
pushd Hyperbolic_triangulation_2_Demo_with_dlls; zip ../Hyperbolic_Delaunay_triangulation_2.zip *; popd
pushd Periodic_4_hyperbolic_triangulation_2_Demo_with_dlls; zip ../Periodic_4_hyperbolic_Delaunay_triangulation_2.zip *; popd
pushd Polygon_Demo_with_dlls; zip -r ../polygon.zip *; popd
pushd Principal_component_analysis_Demo_with_dlls; zip -r ../pca.zip *; popd
pushd Hyperbolic_triangulation_2_Demo_with_dlls; zip -r ../Hyperbolic_Delaunay_triangulation_2.zip *; popd
pushd Periodic_4_hyperbolic_triangulation_2_Demo_with_dlls; zip -r ../Periodic_4_hyperbolic_Delaunay_triangulation_2.zip *; popd
# check
echo CHECK now. The following lines should be empty.