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

Make the dependencies check NOT order dependant.

This commit is contained in:
Maxime Gimeno 2018-05-04 13:55:17 +02:00
parent d3be4bb075
commit af9605a773
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Scripts/developer_scripts/cgal_check_dependencies.sh
View File

@ -28,19 +28,22 @@ do
fi fi
done done
cmake -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++11" .. cmake -DCGAL_HEADER_ONLY=FALSE -DCGAL_ENABLE_CHECK_HEADERS=TRUE -DDOXYGEN_EXECUTABLE="$DOX_PATH" -DCGAL_COPY_DEPENDENCIES=TRUE -DCMAKE_CXX_FLAGS="-std=c++11" ..
make -j$(nproc --all) packages_dependencies make -j$(nproc --all) packages_dependencies
echo " Checks finished" echo " Checks finished"
for pkg_path in $CGAL_ROOT/* for pkg_path in $CGAL_ROOT/*
do do
pkg=$(basename $pkg_path) pkg=$(basename $pkg_path)
if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then
PKG_DIFF=$(diff -N -w "$pkg_path/package_info/$pkg/dependencies.old" "$pkg_path/package_info/$pkg/dependencies" || true) PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies.old" "$pkg_path/package_info/$pkg/dependencies" || true)
if [ -n "$PKG_DIFF" ]; then if [ -n "$PKG_DIFF" ]; then
HAS_DIFF=TRUE HAS_DIFF=TRUE
echo "Differences in $pkg: $PKG_DIFF" echo "Differences in $pkg: $PKG_DIFF are new and not committed."
else fi
echo "No differencies in $pkg dependencies." PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies" "$pkg_path/package_info/$pkg/dependencies.old" || true)
if [ -n "$PKG_DIFF" ]; then
HAS_DIFF=TRUE
echo "Differences in $pkg: $PKG_DIFF have disappeared."
fi fi
if [ -f $pkg_path/package_info/$pkg/dependencies.old ]; then if [ -f $pkg_path/package_info/$pkg/dependencies.old ]; then
rm $pkg_path/package_info/$pkg/dependencies.old rm $pkg_path/package_info/$pkg/dependencies.old
@ -51,7 +54,8 @@ echo " Checks finished"
cd $CGAL_ROOT cd $CGAL_ROOT
rm -r dep_check_build rm -r dep_check_build
if [ -n "$HAS_DIFF" ]; then if [ -n "$HAS_DIFF" ]; then
echo " You should run cmake with options CGAL_ENABLE_CHECK_HEADERS and CGAL_COPY_DEPENDENCIES ON, make the target packages_dependencies and commit the new dependencies files." echo " You can run cmake with options CGAL_ENABLE_CHECK_HEADERS and CGAL_COPY_DEPENDENCIES ON, make the target packages_dependencies and commit the new dependencies files,"
echo " or simply manually edit the problematic files."
exit 1 exit 1
else else
echo "The dependencies are up to date." echo "The dependencies are up to date."