Merge pull request #49 from blueyed/makefile-check-force-compile

Revisit Travis config, fix check target, update compiled files

Author: mattn

.travis.yml

@@ -5,26 +5,28 @@ git:
 
 matrix:
   include:
-    - os: linux
-      env: VIM_VERSION=v7.4
-    - os: linux
-      env: VIM_VERSION=v8.0.0000
-    - os: linux
-      env: VIM_VERSION=master
-
-addons:
-  apt:
-    packages:
-      - language-pack-ja
-      - vim
+    - env:
+      - VIM_VERSION=v7.4
+      - MAKE_TARGET=test
+    - env:
+      - VIM_VERSION=v8.0.0000
+      - MAKE_TARGET=test
+    - env:
+      - VIM_VERSION=master
+      - MAKE_TARGET=test
+    - env:
+      - VIM_VERSION=installed
+      - MAKE_TARGET="clean_compiled check"
 
 install:
-  - bash scripts/install-vim.sh
-  - export PATH=$HOME/vim/bin:$PATH
+  - |
+    if [ "$VIM_VERSION" != 'installed' ]; then
+      bash scripts/install-vim.sh
+      export PATH=$HOME/vim/bin:$PATH
+    fi
 
 script:
   - uname -a
   - which -a vim
   - vim --cmd version --cmd quit
-  - test/run.sh
-  - make check
+  - make $MAKE_TARGET

Makefile

@@ -9,7 +9,13 @@ js/vimlparser.js: autoload/vimlparser.vim js/jscompiler.vim js/vimlfunc.js
 py/vimlparser.py: autoload/vimlparser.vim py/pycompiler.vim py/vimlfunc.py
 	$(VIM_COMPILER) py/pycompiler.vim
 
+clean_compiled:
+	$(RM) $(COMPILED_FILES)
+
 check: all
 	git diff --exit-code $(COMPILED_FILES) || { \
-	  echo 'Compiled files were updated, but should have been committed.'; \
+	  echo 'Compiled files were updated, but should have been included/committed.'; \
 	  exit 1; }
+
+test:
+	test/run.sh