From 39d81a8d68c9ae363052d1a36beef910bd729043 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 6 Jun 2019 16:00:19 +0200 Subject: [PATCH] Use LC_COLLATE to unify the order of the packages list. --- .travis.yml | 24 ++++++++++++------------ .travis/generate_travis.sh | 12 ++++++++---- .travis/packages.txt | 8 ++++---- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c12e76f14d..87a50949400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,10 @@ env: - PACKAGE='AABB_tree Advancing_front_surface_reconstruction Algebraic_foundations ' - PACKAGE='Algebraic_kernel_d Algebraic_kernel_for_circles Algebraic_kernel_for_spheres ' - PACKAGE='Alpha_shapes_2 Alpha_shapes_3 Apollonius_graph_2 ' - - PACKAGE='Arithmetic_kernel Arrangement_on_surface_2 Barycentric_coordinates_2 ' - - PACKAGE='BGL Boolean_set_operations_2 Bounding_volumes ' - - PACKAGE='Box_intersection_d Cartesian_kernel CGAL_Core ' - - PACKAGE='CGAL_ImageIO CGAL_ipelets Circular_kernel_2 ' + - PACKAGE='Arithmetic_kernel Arrangement_on_surface_2 BGL ' + - PACKAGE='Barycentric_coordinates_2 Boolean_set_operations_2 Bounding_volumes ' + - PACKAGE='Box_intersection_d CGAL_Core CGAL_ImageIO ' + - PACKAGE='CGAL_ipelets Cartesian_kernel Circular_kernel_2 ' - PACKAGE='Circular_kernel_3 Circulator Classification ' - PACKAGE='Combinatorial_map Cone_spanners_2 Convex_decomposition_3 ' - PACKAGE='Convex_hull_2 Convex_hull_3 Convex_hull_d ' @@ -38,16 +38,16 @@ env: - PACKAGE='Polyhedron_IO 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 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 STL_Extension ' + - 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_mesher Surface_mesh_parameterization ' - - PACKAGE='Surface_mesh_segmentation Surface_mesh_shortest_path Surface_mesh_simplification ' - - PACKAGE='Surface_mesh_skeletonization Surface_sweep_2 TDS_2 ' + - PACKAGE='Surface_mesh_deformation Surface_mesh_parameterization Surface_mesh_segmentation ' + - PACKAGE='Surface_mesh_shortest_path Surface_mesh_simplification Surface_mesh_skeletonization ' + - PACKAGE='Surface_mesher Surface_sweep_2 TDS_2 ' - PACKAGE='TDS_3 Testsuite Three ' - PACKAGE='Triangulation Triangulation_2 Triangulation_3 ' - PACKAGE='Union_find Visibility_2 Voronoi_diagram_2 ' diff --git a/.travis/generate_travis.sh b/.travis/generate_travis.sh index 6f70a2d0eb6..e1b42eeedc3 100755 --- a/.travis/generate_travis.sh +++ b/.travis/generate_travis.sh @@ -21,16 +21,20 @@ for f in * do if [ -d "$f/package_info/$f" ] then - PACKAGES[$INDEX]+="$f " + echo "$f " >> ./tmp.txt + fi +done + LC_COLLATE=C sort ./tmp.txt > ./.travis/packages.txt + rm ./tmp.txt + while read p; do + PACKAGES[$INDEX]+="$p " i=$[i+1] if [ $i = 3 ] then i=0 INDEX=$[INDEX+1] fi - echo "$f " >> ./.travis/packages.txt - fi -done +done <./.travis/packages.txt if [ -f ".travis.yml" ] then #copy the current .travis.yml for later check diff --git a/.travis/packages.txt b/.travis/packages.txt index 81b8c3830d3..8b65c6e9f2a 100644 --- a/.travis/packages.txt +++ b/.travis/packages.txt @@ -9,15 +9,15 @@ Alpha_shapes_3 Apollonius_graph_2 Arithmetic_kernel Arrangement_on_surface_2 -Barycentric_coordinates_2 BGL +Barycentric_coordinates_2 Boolean_set_operations_2 Bounding_volumes Box_intersection_d -Cartesian_kernel CGAL_Core CGAL_ImageIO CGAL_ipelets +Cartesian_kernel Circular_kernel_2 Circular_kernel_3 Circulator @@ -96,6 +96,7 @@ Property_map QP_solver Random_numbers Ridges_3 +STL_Extension Scale_space_reconstruction_3 Scripts SearchStructures @@ -108,7 +109,6 @@ Snap_rounding_2 Solver_interface Spatial_searching Spatial_sorting -STL_Extension Straight_skeleton_2 Stream_lines_2 Stream_support @@ -116,12 +116,12 @@ Subdivision_method_3 Surface_mesh Surface_mesh_approximation Surface_mesh_deformation -Surface_mesher Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path Surface_mesh_simplification Surface_mesh_skeletonization +Surface_mesher Surface_sweep_2 TDS_2 TDS_3