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

Merge pull request #2755 from maxGimeno/Travis-Remove_gcc-GF 

Travis: Remove GCC
This commit is contained in:
Laurent Rineau 2018-01-31 12:06:45 +01:00 committed by GitHub
parent d54113c18b f9a28aadb8
commit 9bb3acdb56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 111 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
.travis.yml
View File

@ -1,58 +1,104 @@
language: cpp language: cpp
dist: trusty dist: trusty
sudo: required sudo: required
env: matrix:
matrix: include:
- PACKAGE='CHECK' - compiler: gcc
- PACKAGE='AABB_tree Advancing_front_surface_reconstruction Algebraic_foundations ' env: PACKAGE='CHECK'
- PACKAGE='Algebraic_kernel_d Algebraic_kernel_for_circles Algebraic_kernel_for_spheres ' - compiler: clang-3.6
- PACKAGE='Alpha_shapes_2 Alpha_shapes_3 Apollonius_graph_2 ' env: PACKAGE='CHECK'
- PACKAGE='Arithmetic_kernel Arrangement_on_surface_2 Barycentric_coordinates_2 ' - compiler: clang-3.6
- PACKAGE='BGL Boolean_set_operations_2 Bounding_volumes ' env: PACKAGE='AABB_tree Advancing_front_surface_reconstruction Algebraic_foundations '
- PACKAGE='Box_intersection_d Cartesian_kernel CGAL_Core ' - compiler: clang-3.6
- PACKAGE='CGAL_ImageIO CGAL_ipelets Circular_kernel_2 ' env: PACKAGE='Algebraic_kernel_d Algebraic_kernel_for_circles Algebraic_kernel_for_spheres '
- PACKAGE='Circular_kernel_3 Circulator Classification ' - compiler: clang-3.6
- PACKAGE='Combinatorial_map Cone_spanners_2 Convex_decomposition_3 ' env: PACKAGE='Alpha_shapes_2 Alpha_shapes_3 Apollonius_graph_2 '
- PACKAGE='Convex_hull_2 Convex_hull_3 Convex_hull_d ' - compiler: clang-3.6
- PACKAGE='Distance_2 Distance_3 Envelope_2 ' env: PACKAGE='Arithmetic_kernel Arrangement_on_surface_2 Barycentric_coordinates_2 '
- PACKAGE='Envelope_3 Filtered_kernel Generalized_map ' - compiler: clang-3.6
- PACKAGE='Generator Geomview GraphicsView ' env: PACKAGE='BGL Boolean_set_operations_2 Bounding_volumes '
- PACKAGE='HalfedgeDS Hash_map Homogeneous_kernel ' - compiler: clang-3.6
- PACKAGE='Inscribed_areas Installation Interpolation ' env: PACKAGE='Box_intersection_d Cartesian_kernel CGAL_Core '
- PACKAGE='Intersections_2 Intersections_3 Interval_skip_list ' - compiler: clang-3.6
- PACKAGE='Interval_support Inventor Jet_fitting_3 ' env: PACKAGE='CGAL_ImageIO CGAL_ipelets Circular_kernel_2 '
- PACKAGE='Kernel_23 Kernel_d Kinetic_data_structures ' - compiler: clang-3.6
- PACKAGE='Kinetic_framework LEDA Linear_cell_complex ' env: PACKAGE='Circular_kernel_3 Circulator Classification '
- PACKAGE='MacOSX Maintenance Matrix_search ' - compiler: clang-3.6
- PACKAGE='Mesh_2 Mesh_3 Mesher_level ' env: PACKAGE='Combinatorial_map Cone_spanners_2 Convex_decomposition_3 '
- PACKAGE='Minkowski_sum_2 Minkowski_sum_3 Modifier ' - compiler: clang-3.6
- PACKAGE='Modular_arithmetic Nef_2 Nef_3 ' env: PACKAGE='Convex_hull_2 Convex_hull_3 Convex_hull_d '
- PACKAGE='Nef_S2 NewKernel_d Number_types ' - compiler: clang-3.6
- PACKAGE='OpenNL Operations_on_polyhedra Optimal_transportation_reconstruction_2 ' env: PACKAGE='Distance_2 Distance_3 Envelope_2 '
- PACKAGE='Optimisation_basic Partition_2 Periodic_2_triangulation_2 ' - compiler: clang-3.6
- PACKAGE='Periodic_3_triangulation_3 Point_set_2 Point_set_3 ' env: PACKAGE='Envelope_3 Filtered_kernel Generalized_map '
- PACKAGE='Point_set_processing_3 Point_set_shape_detection_3 Poisson_surface_reconstruction_3 ' - compiler: clang-3.6
- PACKAGE='Polygon Polygon_mesh_processing Polyhedron ' env: PACKAGE='Generator Geomview GraphicsView '
- PACKAGE='Polyhedron_IO Polyline_simplification_2 Polynomial ' - compiler: clang-3.6
- PACKAGE='Polytope_distance_d Principal_component_analysis Principal_component_analysis_LGPL ' env: PACKAGE='HalfedgeDS Hash_map Homogeneous_kernel '
- PACKAGE='Profiling_tools Property_map QP_solver ' - compiler: clang-3.6
- PACKAGE='Random_numbers Ridges_3 Scale_space_reconstruction_3 ' env: PACKAGE='Inscribed_areas Installation Interpolation '
- PACKAGE='Scripts SearchStructures Segment_Delaunay_graph_2 ' - compiler: clang-3.6
- PACKAGE='Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 Skin_surface_3 ' env: PACKAGE='Intersections_2 Intersections_3 Interval_skip_list '
- PACKAGE='Snap_rounding_2 Solver_interface Spatial_searching ' - compiler: clang-3.6
- PACKAGE='Spatial_sorting STL_Extension Straight_skeleton_2 ' env: PACKAGE='Interval_support Inventor Jet_fitting_3 '
- PACKAGE='Stream_lines_2 Stream_support Subdivision_method_3 ' - compiler: clang-3.6
- PACKAGE='Surface_mesh Surface_mesh_deformation Surface_mesher ' env: PACKAGE='Kernel_23 Kernel_d Kinetic_data_structures '
- PACKAGE='Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path ' - compiler: clang-3.6
- PACKAGE='Surface_mesh_simplification Surface_mesh_skeletonization Surface_sweep_2 ' env: PACKAGE='Kinetic_framework LEDA Linear_cell_complex '
- PACKAGE='TDS_2 TDS_3 Testsuite ' - compiler: clang-3.6
- PACKAGE='Three Triangulation Triangulation_2 ' env: PACKAGE='MacOSX Maintenance Matrix_search '
- PACKAGE='Triangulation_3 Union_find Visibility_2 ' - compiler: clang-3.6
- PACKAGE='Voronoi_diagram_2 wininst ' env: PACKAGE='Mesh_2 Mesh_3 Mesher_level '
- PACKAGE='Polyhedron_demo' - compiler: clang-3.6
compiler: env: PACKAGE='Minkowski_sum_2 Minkowski_sum_3 Modifier '
- clang-3.6 - compiler: clang-3.6
- gcc env: PACKAGE='Modular_arithmetic Nef_2 Nef_3 '
- compiler: clang-3.6
env: PACKAGE='Nef_S2 NewKernel_d Number_types '
- compiler: clang-3.6
env: PACKAGE='OpenNL Operations_on_polyhedra Optimal_transportation_reconstruction_2 '
- compiler: clang-3.6
env: PACKAGE='Optimisation_basic Partition_2 Periodic_2_triangulation_2 '
- compiler: clang-3.6
env: PACKAGE='Periodic_3_triangulation_3 Point_set_2 Point_set_3 '
- compiler: clang-3.6
env: PACKAGE='Point_set_processing_3 Point_set_shape_detection_3 Poisson_surface_reconstruction_3 '
- compiler: clang-3.6
env: PACKAGE='Polygon Polygon_mesh_processing Polyhedron '
- compiler: clang-3.6
env: PACKAGE='Polyhedron_IO Polyline_simplification_2 Polynomial '
- compiler: clang-3.6
env: PACKAGE='Polytope_distance_d Principal_component_analysis Principal_component_analysis_LGPL '
- compiler: clang-3.6
env: PACKAGE='Profiling_tools Property_map QP_solver '
- compiler: clang-3.6
env: PACKAGE='Random_numbers Ridges_3 Scale_space_reconstruction_3 '
- compiler: clang-3.6
env: PACKAGE='Scripts SearchStructures Segment_Delaunay_graph_2 '
- compiler: clang-3.6
env: PACKAGE='Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 Skin_surface_3 '
- compiler: clang-3.6
env: PACKAGE='Snap_rounding_2 Solver_interface Spatial_searching '
- compiler: clang-3.6
env: PACKAGE='Spatial_sorting STL_Extension Straight_skeleton_2 '
- compiler: clang-3.6
env: PACKAGE='Stream_lines_2 Stream_support Subdivision_method_3 '
- compiler: clang-3.6
env: PACKAGE='Surface_mesh Surface_mesh_deformation Surface_mesher '
- compiler: clang-3.6
env: PACKAGE='Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path '
- compiler: clang-3.6
env: PACKAGE='Surface_mesh_simplification Surface_mesh_skeletonization Surface_sweep_2 '
- compiler: clang-3.6
env: PACKAGE='TDS_2 TDS_3 Testsuite '
- compiler: clang-3.6
env: PACKAGE='Three Triangulation Triangulation_2 '
- compiler: clang-3.6
env: PACKAGE='Triangulation_3 Union_find Visibility_2 '
- compiler: clang-3.6
env: PACKAGE='Voronoi_diagram_2 wininst '
- compiler: clang-3.6
env: PACKAGE='Polyhedron_demo'
install: install:
- if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi
before_script: before_script:

17
.travis/generate_travis.sh
View File

@ -41,27 +41,32 @@ old_IFS=$IFS
IFS=$'\n' IFS=$'\n'
for LINE in $(cat "$PWD/.travis/template.txt") for LINE in $(cat "$PWD/.travis/template.txt")
do do
if [ "$LINE" != " matrix: " ] if [ "$LINE" != " include:" ]
then then
echo "$LINE" >> .travis.yml echo "$LINE" >> .travis.yml
else else
break break
fi fi
done done
echo " matrix: " >> .travis.yml echo " include: " >> .travis.yml
#writes the matrix #writes the matrix
echo " - PACKAGE='CHECK' " >> .travis.yml echo " - compiler: gcc " >> .travis.yml
echo " env: PACKAGE='CHECK' " >> .travis.yml
echo " - compiler: clang-3.6" >> .travis.yml
echo " env: PACKAGE='CHECK' " >> .travis.yml
for package in ${PACKAGES[@]} for package in ${PACKAGES[@]}
do do
echo " - PACKAGE='$package' " >> .travis.yml echo " - compiler: clang-3.6" >> .travis.yml
echo " env: PACKAGE='$package' " >> .travis.yml
done done
echo " - PACKAGE='Polyhedron_demo' " >> .travis.yml echo " - compiler: clang-3.6" >> .travis.yml
echo " env: PACKAGE='Polyhedron_demo' " >> .travis.yml
#writes the end of the file #writes the end of the file
COPY=0 COPY=0
for LINE in $(cat "$PWD/.travis/template.txt") for LINE in $(cat "$PWD/.travis/template.txt")
do do
if [ "$LINE" = "compiler: " ] if [ "$LINE" = "install: " ]
then then
COPY=1 COPY=1
fi fi

7
.travis/template.txt
View File

@ -1,12 +1,9 @@
language: cpp language: cpp
dist: trusty dist: trusty
sudo: required sudo: required
env: matrix:
matrix: include:
PACKAGES_MATRIX PACKAGES_MATRIX
compiler:
- clang-3.6
- gcc
install: install:
- if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi