Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Unified Diff: Makefile

Issue 1436283002: Add support for jslint and cleanup core JavaScript files (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « .jslintrc ('k') | build_tools/naclprocess.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile
diff --git a/Makefile b/Makefile
index b769d5559ef44702b2162a9bd309054eb0582e1e..bf8a5fc5dd9e53d297cb935df85d2d3ebaeabb53 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,11 @@
# at out/sentinels/*
PYLINT = build_tools/python_wrapper -m pylint
-JSHINT = nodejs node_modules/.bin/jshint
-COVERAGE = bin/coverage
-COVERAGE_ARGS = --fail-under=60
+NODE ?= nodejs
+JSHINT := $(NODE) node_modules/.bin/jshint
+JSLINT := $(NODE) node_modules/.bin/jslint
+COVERAGE := bin/coverage
+COVERAGE_ARGS := --fail-under=60
COVERAGE_VER := $(shell $(COVERAGE) --version 2>/dev/null)
ifeq ($(V),1)
@@ -65,7 +67,7 @@ check: test
JS_FILES := $(shell git ls-files "*.js")
-lint: pylint jshint
+lint: pylint jshint jslint
pylint:
$(PYLINT) --rcfile=.pylintrc lib/naclports lib/naclports/tests/*.py
@@ -73,6 +75,9 @@ pylint:
jshint:
$(JSHINT) $(JS_FILES)
+jslint:
+ $(JSLINT) build_tools/naclprocess.js build_tools/naclterm.js
+
test:
$(COVERAGE) run --include=lib/naclports/*,build_tools/* -m nose \
--rednose build_tools lib
@@ -84,4 +89,4 @@ test:
bin/naclports install $* $(BUILD_FLAGS)
.PHONY: all run clean sdklibs sdklibs_list reallyclean check test
-.PHONY: lint pylint jshint
+.PHONY: lint pylint jshint jslint
« no previous file with comments | « .jslintrc ('k') | build_tools/naclprocess.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698