Index: Makefile |
diff --git a/Makefile b/Makefile |
index b8193bf5d40070d715a32f915441940f2bcc17f6..b769d5559ef44702b2162a9bd309054eb0582e1e 100644 |
--- a/Makefile |
+++ b/Makefile |
@@ -12,6 +12,7 @@ |
# at out/sentinels/* |
PYLINT = build_tools/python_wrapper -m pylint |
+JSHINT = nodejs node_modules/.bin/jshint |
COVERAGE = bin/coverage |
COVERAGE_ARGS = --fail-under=60 |
COVERAGE_VER := $(shell $(COVERAGE) --version 2>/dev/null) |
@@ -62,9 +63,16 @@ reallyclean: clean |
check: test |
-lint: |
+JS_FILES := $(shell git ls-files "*.js") |
+ |
+lint: pylint jshint |
+ |
+pylint: |
$(PYLINT) --rcfile=.pylintrc lib/naclports lib/naclports/tests/*.py |
+jshint: |
+ $(JSHINT) $(JS_FILES) |
+ |
test: |
$(COVERAGE) run --include=lib/naclports/*,build_tools/* -m nose \ |
--rednose build_tools lib |
@@ -75,4 +83,5 @@ test: |
%: |
bin/naclports install $* $(BUILD_FLAGS) |
-.PHONY: all run clean sdklibs sdklibs_list reallyclean check test lint |
+.PHONY: all run clean sdklibs sdklibs_list reallyclean check test |
+.PHONY: lint pylint jshint |