Skip to content

fix check-dependencies (master) #4106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

lrineau
Copy link
Member

@lrineau lrineau commented Jul 23, 2019

Summary of Changes

#4105, adapted to master

Release Management

  • Affected package(s): Installation

@lrineau lrineau added this to the 5.0-beta1 milestone Jul 23, 2019
@maxGimeno
Copy link
Contributor

maxGimeno commented Jul 24, 2019

Travis detected differences in the dependencies. Are those what's expected from this PR ? In such case pleae correct them in the package_info files

Differences in TDS_2: Interval_support
Modular_arithmetic
Number_types have disappeared.
 Differences in Random_numbers: Random_numbers have disappeared.
 Differences in Geomview: Geomview have disappeared.

@lrineau
Copy link
Member Author

lrineau commented Jul 24, 2019

@maxGimeno commented on Jul 24, 2019, 9:09 AM GMT+2:

Travis detected differences in the dependencies. Are those what's expected from this PR ? In such case pleae correct them in the package_info files

Differences in TDS_2: Interval_support
Modular_arithmetic
Number_types have disappeared.
 Differences in Random_numbers: Random_numbers have disappeared.
 Differences in Geomview: Geomview have disappeared.

Those are exactly the difference between running the dependency checking with CGAL_HEADER_ONLY set or not. I have committed 741b3ce so that Travis uses the default.

@lrineau
Copy link
Member Author

lrineau commented Jul 24, 2019

for pkg_path in $CGAL_ROOT/*
do
pkg=$(basename $pkg_path)
if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then
PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies.old" "$pkg_path/package_info/$pkg/dependencies" || true)
if [ -n "$PKG_DIFF" ]; then
TOTAL_RES="Differences in $pkg: $PKG_DIFF are new and not committed.\n $TOTAL_RES"
fi
PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies" "$pkg_path/package_info/$pkg/dependencies.old" || true)
if [ -n "$PKG_DIFF" ]; then
TOTAL_RES="Differences in $pkg: $PKG_DIFF have disappeared.\n $TOTAL_RES"
fi
if [ -f $pkg_path/package_info/$pkg/dependencies.old ]; then
rm $pkg_path/package_info/$pkg/dependencies.old
fi
fi

I think we should enforce that the dependencies files are sorted, and use a plain diff instead of that complicated logic. What is more, the diff would help fix the issue, by using patch to apply the diff.

@lrineau
Copy link
Member Author

lrineau commented Jul 24, 2019

@lrineau commented on Jul 24, 2019, 3:44 PM GMT+2:

for pkg_path in $CGAL_ROOT/*
do
pkg=$(basename $pkg_path)
if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then
PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies.old" "$pkg_path/package_info/$pkg/dependencies" || true)
if [ -n "$PKG_DIFF" ]; then
TOTAL_RES="Differences in $pkg: $PKG_DIFF are new and not committed.\n $TOTAL_RES"
fi
PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies" "$pkg_path/package_info/$pkg/dependencies.old" || true)
if [ -n "$PKG_DIFF" ]; then
TOTAL_RES="Differences in $pkg: $PKG_DIFF have disappeared.\n $TOTAL_RES"
fi
if [ -f $pkg_path/package_info/$pkg/dependencies.old ]; then
rm $pkg_path/package_info/$pkg/dependencies.old
fi
fi

I think we should enforce that the dependencies files are sorted, and use a plain diff instead of that complicated logic. What is more, the diff would help fix the issue, by using patch to apply the diff.

Actually, a git diff would be the best.

@maxGimeno
Copy link
Contributor

Careful, now there are misisng include headers errors:

/home/travis/build/CGAL/cgal/Polytope_distance_d/include/CGAL/Width_polyhedron_3.h:166:5: error: 
      use of undeclared identifier 'endl'; did you mean 'std::endl'?
    DEBUGENDL(VISITED_CHECK,"Visited flag value of edge "

@lrineau lrineau force-pushed the CGAL-fix_check_dependencies__master-GF branch from 8011447 to c35ddbd Compare July 31, 2019 10:43
@lrineau lrineau modified the milestones: 5.0-beta1, 5.0-beta2 Sep 23, 2019
@lrineau lrineau removed this from the 5.0-beta2 milestone Oct 2, 2019
@lrineau lrineau added this to the 5.1-beta milestone Oct 2, 2019
@maxGimeno
Copy link
Contributor

This PR is not in shape to be tested.

@lrineau lrineau modified the milestones: 5.1-beta, Trash / Attic Apr 7, 2020
@lrineau lrineau added the Stalled label Apr 7, 2020
@lrineau
Copy link
Member Author

lrineau commented Apr 7, 2020

I have removed it from the 5.1 milestone (Trash/stalled).

@lrineau
Copy link
Member Author

lrineau commented Oct 18, 2021

@sloriot

I would like to have the time to revive this branch, and then use Github Actions to automatically rebuild the graph at each pull-requests and pushes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants