Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / tools / check_dist_archive

diff --git a/tools/check_dist_archive b/tools/check_dist_archive
index 38fe76d..53b1d1f 100755 (executable)
--- a/tools/check_dist_archive
+++ b/tools/check_dist_archive
@@ -86,7 +86,13 @@ diffcmd() {
         echo "The archive looks good."
     else
         status=1
-        echo "Some files are missing and/or unexpected in the archive."
+        cat <<EOF
+ERROR: Some files are missing and/or unexpected in the archive.
+* lines beginning with '-' give files that are unexpected in the archive
+* lines beginning with '+' give files that are missing from the archive
+Please fix CMake files (e.g. "buildtools/Cmake/DefinePackages.cmake"),
+and/or "tools/check_dist_archive.exclude".
+EOF
         diff -u "$fa" "$fb"
     fi
 }
@@ -94,9 +100,9 @@ diffcmd() {
 colordiff=$(type -p colordiff)
 colorless() {
     if [ -x "$colordiff" ]; then
-        "$colordiff" | less -R -F
+        "$colordiff" | less -R -F -X
     else
-        less -F
+        less -F -X
     fi
 }