From 54b9591a82889e3cdb31325e22c5af3e0e69e3df Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Mon, 9 Oct 2017 13:55:54 +0200
Subject: Add linter.

---
 dev/lint-commits.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100755 dev/lint-commits.sh

(limited to 'dev')

diff --git a/dev/lint-commits.sh b/dev/lint-commits.sh
new file mode 100755
index 0000000000..eb12bc2273
--- /dev/null
+++ b/dev/lint-commits.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# A script to check prettyness for a range of commits
+
+CALLNAME="$0"
+
+function usage
+{
+    >&2 echo "usage: $CALLNAME <commit> <commit>"
+    >&2 echo "The order of commits is as given to 'git diff'"
+}
+
+if [ "$#" != 2 ];
+then
+    usage
+    exit 1
+fi
+
+BASE_COMMIT="$1"
+HEAD_COMMIT="$2"
+
+# git diff --check
+# uses .gitattributes to know what to check
+if git diff --check "$BASE_COMMIT" "$HEAD_COMMIT";
+then
+    :
+else
+    >&2 echo "Whitespace errors!"
+    >&2 echo "Running 'git diff --check $BASE_COMMIT $HEAD_COMMIT'."
+    >&2 echo "If you use emacs, you can prevent this kind of error from reocurring by installing ws-butler and enabling ws-butler-convert-leading-tabs-or-spaces."
+    exit 1
+fi
-- 
cgit v1.2.3


From 4c954a3479e002d3a350c3094ae73e6ca5865202 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Tue, 24 Oct 2017 14:41:05 +0200
Subject: Put newlines at the end of files.

---
 dev/build/windows/MakeCoq_regtest_noproxy.bat | 4 ++--
 dev/build/windows/configure_profile.sh        | 2 +-
 dev/build/windows/patches_coq/ln.c            | 2 +-
 dev/nsis/FileAssociation.nsh                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'dev')

diff --git a/dev/build/windows/MakeCoq_regtest_noproxy.bat b/dev/build/windows/MakeCoq_regtest_noproxy.bat
index 7b17e721b3..7140a7c619 100644
--- a/dev/build/windows/MakeCoq_regtest_noproxy.bat
+++ b/dev/build/windows/MakeCoq_regtest_noproxy.bat
@@ -25,5 +25,5 @@ call MakeCoq_MinGW.bat ^
   -cygquiet=Y ^
   -destcyg   %ROOTPATH%\cygwin_coq64_85pl2_abs ^
   -destcoq   %ROOTPATH%\coq64_85pl2_abs
-
-pause
\ No newline at end of file
+
+pause
diff --git a/dev/build/windows/configure_profile.sh b/dev/build/windows/configure_profile.sh
index 0b61a31e7f..16c972e80c 100644
--- a/dev/build/windows/configure_profile.sh
+++ b/dev/build/windows/configure_profile.sh
@@ -40,4 +40,4 @@ if [ ! -f $donefile ] ; then
     echo unset OCAMLLIB >> $rcfile
 
     touch $donefile
-fi
\ No newline at end of file
+fi
diff --git a/dev/build/windows/patches_coq/ln.c b/dev/build/windows/patches_coq/ln.c
index 5e02c72bb7..41f64f98b2 100644
--- a/dev/build/windows/patches_coq/ln.c
+++ b/dev/build/windows/patches_coq/ln.c
@@ -134,4 +134,4 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
     
     // Everything is fine
     return 0;
-}
\ No newline at end of file
+}
diff --git a/dev/nsis/FileAssociation.nsh b/dev/nsis/FileAssociation.nsh
index b8c1e5ee78..71a9162efc 100644
--- a/dev/nsis/FileAssociation.nsh
+++ b/dev/nsis/FileAssociation.nsh
@@ -187,4 +187,4 @@ NoOwn:
   !verbose pop
 !macroend
  
-!endif # !FileAssociation_INCLUDED
\ No newline at end of file
+!endif # !FileAssociation_INCLUDED
-- 
cgit v1.2.3


From d3de8fe500c736aa92aa87c9cd8b83fa4f44b7d8 Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Tue, 24 Oct 2017 14:41:36 +0200
Subject: Linter: check that files end with newlines.

We use git check-attr to look at the same files as git diff --check.
---
 dev/lint-repository.sh               | 28 ++++++++++++++++++++++++++++
 dev/tools/check-eof-newline.sh       |  9 +++++++++
 dev/tools/should-check-whitespace.sh |  5 +++++
 3 files changed, 42 insertions(+)
 create mode 100755 dev/lint-repository.sh
 create mode 100755 dev/tools/check-eof-newline.sh
 create mode 100755 dev/tools/should-check-whitespace.sh

(limited to 'dev')

diff --git a/dev/lint-repository.sh b/dev/lint-repository.sh
new file mode 100755
index 0000000000..ecf7880e20
--- /dev/null
+++ b/dev/lint-repository.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# A script to check prettyness over the repository.
+
+# lint-commits.sh seeks to prevent the worsening of already present
+# problems, such as tab indentation in ml files. lint-repository.sh
+# seeks to prevent the (re-)introduction of solved problems, such as
+# newlines at the end of .v files.
+
+CODE=0
+
+if [ "(" "-n" "${TRAVIS_PULL_REQUEST}" ")" "-a" "(" "${TRAVIS_PULL_REQUEST}" "!=" "false" ")" ];
+then
+    # Some problems are too widespread to fix in one commit, but we
+    # can still check that they don't worsen.
+    CUR_HEAD=${TRAVIS_COMMIT_RANGE%%...*}
+    PR_HEAD=${TRAVIS_COMMIT_RANGE##*...}
+    MERGE_BASE=$(git merge-base $CUR_HEAD $PR_HEAD)
+    dev/lint-commits.sh $MERGE_BASE $PR_HEAD || CODE=1
+fi
+
+# Check that the files with 'whitespace' gitattribute end in a newline.
+# xargs exit status is 123 if any file failed the test
+find . "(" -path ./.git -prune ")" -type f \
+-o "(" -exec dev/tools/should-check-whitespace.sh '{}' ';' ")" \
+-print0 | xargs -0 -L 1 dev/tools/check-eof-newline.sh || CODE=1
+
+exit $CODE
diff --git a/dev/tools/check-eof-newline.sh b/dev/tools/check-eof-newline.sh
new file mode 100755
index 0000000000..1c578c05ce
--- /dev/null
+++ b/dev/tools/check-eof-newline.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if [ -z "$(tail -c 1 "$1")" ]
+then
+    exit 0
+else
+    echo "No newline at end of file $1!"
+    exit 1
+fi
diff --git a/dev/tools/should-check-whitespace.sh b/dev/tools/should-check-whitespace.sh
new file mode 100755
index 0000000000..8159506b41
--- /dev/null
+++ b/dev/tools/should-check-whitespace.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# determine if a file has whitespace checking enabled in .gitattributes
+
+git check-attr whitespace -- "$1" | grep -q -v 'unspecified$'
-- 
cgit v1.2.3