Merge pull request #881 from blueyed/build-improvements

Build improvements

.gitignore

@@ -24,3 +24,4 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+build/

.travis.yml

@@ -34,18 +34,15 @@ install:
     elif [ "${LINT#vint}" != "$LINT" ]; then
       virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint
     elif [ "${LINT#vader}" != "$LINT" ]; then
-      git clone https://github.com/junegunn/vader.vim.git /tmp/vader
       C_OPTS="--prefix=$DEPS --with-features=huge --disable-gui --enable-pythoninterp"
-      git clone --depth 1 https://github.com/vim/vim
-      cd vim
-      ./configure $C_OPTS
-      make
-      make install
-      cd -
+      (git clone --depth 1 https://github.com/vim/vim /tmp/vim &&
+       cd /tmp/vim &&
+       ./configure $C_OPTS &&
+       make install)
     fi
 script:
   - |
-    set -e
+    set -ex
     if [ "$LINT" = "vimlint" ]; then
       for file in $(find . -name "*.vim");
       do
@@ -61,5 +58,5 @@ script:
     elif [ "$LINT" = "vint-errors" ]; then
       vint --error .
     elif [ "$LINT" = "vader" ]; then
-      vim -Nu test/test.vim -c 'Vader! test/**'
+      make test
     fi

Makefile

@@ -0,0 +1,13 @@
+test: build/vader | build
+	vim -Nu test/vimrc -c 'Vader! test/**'
+
+build/vader:
+	git clone --depth 1 https://github.com/junegunn/vader.vim.git $@
+
+build:
+	mkdir -p $@
+
+clean:
+	$(RM) -r build
+
+.PHONY: clean test

codecov.yml

@@ -1,2 +0,0 @@
-[run]
-plugins = covimerage

test/test.sh

@@ -1,4 +0,0 @@
-if [ ! -e /tmp/vader ]; then
-    git clone https://github.com/junegunn/vader.vim.git /tmp/vader
-fi
-vim -Nu test/test.vim -c 'Vader! test/**'

test/vimrc

@@ -1,5 +1,5 @@
 filetype off
-set rtp+=/tmp/vader
+set rtp+=build/vader
 set rtp+=.
 set rtp+=after
 filetype plugin indent on