Fix the script cgal_check_dependencies.sh

This commit is contained in:
Laurent Rineau 2022-09-27 14:31:50 +02:00
parent b2f661f2dc
commit ba47ed444a
3 changed files with 7 additions and 3 deletions

View File

@ -27,6 +27,10 @@ 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
mv $pkg_path/package_info/$pkg/dependencies $pkg_path/package_info/$pkg/dependencies.old mv $pkg_path/package_info/$pkg/dependencies $pkg_path/package_info/$pkg/dependencies.old
else
if [ -d $pkg_path/package_info/$pkg ]; then
touch $pkg_path/package_info/$pkg/dependencies.old
fi
fi fi
done done
@ -42,11 +46,11 @@ do
if [ -f "$pkg_path/package_info/$pkg/dependencies" ]; then 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) 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
TOTAL_RES="Differences in $pkg: $PKG_DIFF are new and not committed.\n $TOTAL_RES" TOTAL_RES="Differences in $pkg:\n$PKG_DIFF\nare new and not committed.\n$TOTAL_RES"
fi fi
PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies" "$pkg_path/package_info/$pkg/dependencies.old" || true) PKG_DIFF=$(grep -Fxv -f "$pkg_path/package_info/$pkg/dependencies" "$pkg_path/package_info/$pkg/dependencies.old" || true)
if [ -n "$PKG_DIFF" ]; then if [ -n "$PKG_DIFF" ]; then
TOTAL_RES="Differences in $pkg: $PKG_DIFF have disappeared.\n $TOTAL_RES" TOTAL_RES="Differences in $pkg:\n$PKG_DIFF\mhave disappeared.\n$TOTAL_RES"
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
@ -55,7 +59,7 @@ do
done done
echo " Checks finished" echo " Checks finished"
cd $CGAL_ROOT cd $CGAL_ROOT
rm -r dep_check_build #rm -r dep_check_build
if [ -n "$TOTAL_RES" ]; then if [ -n "$TOTAL_RES" ]; then
printf "$TOTAL_RES" printf "$TOTAL_RES"
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 " 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,"