Skip to content
Snippets Groups Projects
Commit ea296553 authored by Philippe Gravel's avatar Philippe Gravel
Browse files

Add support for conditionally failing on JSLint errors

Default behavior is to suppress JSLint errors.
To enable blocking on JSLint error, projects must add "LOCAL_JSLINT_FATAL := 1"
to their makefile.

Change-Id: I8e652dad4aa2e2400cf7629d891fdb08c1eb0834
parent 6d90df25
No related branches found
No related tags found
No related merge requests found
......@@ -7,6 +7,7 @@ LOCAL_INSTALLED_XPCOM_IDL_HEADERS :=
LOCAL_JS_NOTICE :=
LOCAL_JS_SRC_FILES :=
LOCAL_JS_LINTONLY_FILES :=
LOCAL_JSLINT_FATAL :=
LOCAL_XPCOM_IDLS :=
LOCAL_XPCOM_INSTALL_DIR :=
LOCAL_XPCOM_MODULE_OBJDIR :=
......
......@@ -186,16 +186,17 @@ endif
ifdef USE_JSMIN
JSMIN := $(BUILD_OUT_EXECUTABLES)/jsmin$(BUILD_EXECUTABLE_SUFFIX)
$(INSTALLED_JS_FILES): PRIVATE_JS_NOTICE := $(LOCAL_JS_NOTICE)
$(INSTALLED_JS_FILES): PRIVATE_JSLINT_FATAL := $(LOCAL_JSLINT_FATAL)
$(INSTALLED_JS_FILES): $(LOCAL_MODULE_PATH)/%.js: $(LOCAL_PATH)/%.js $(JSMIN) $(DEPENDS_ON_GECKO)
ifdef GJSLINT
$(GJSLINT) $<
$(if $(filter $(PRIVATE_JSLINT_FATAL),1),,-)$(GJSLINT) $<
endif
@mkdir -p $(@D)
$(JSMIN) < $< > $@ '$(PRIVATE_JS_NOTICE)'
else
$(INSTALLED_JS_FILES): $(LOCAL_MODULE_PATH)/%.js: $(LOCAL_PATH)/%.js $(ACP) $(DEPENDS_ON_GECKO)
ifdef GJSLINT
$(GJSLINT) $<
$(if $(filter $(PRIVATE_JSLINT_FATAL),1),,-)$(GJSLINT) $<
endif
@mkdir -p $(@D)
$(ACP) $< $@
......@@ -203,9 +204,10 @@ endif
JS_LINTONLY_OK_FILES := $(addsuffix .ok, $(addprefix $(LOCAL_XPCOM_MODULE_OBJDIR)/,$(LOCAL_JS_LINTONLY_FILES)))
$(JS_LINTONLY_OK_FILES): PRIVATE_JSLINT_FATAL := $(LOCAL_JSLINT_FATAL)
$(JS_LINTONLY_OK_FILES): $(LOCAL_XPCOM_MODULE_OBJDIR)/%.js.ok: $(LOCAL_PATH)/%.js
ifdef GJSLINT
$(GJSLINT) $<
$(if $(filter $(PRIVATE_JSLINT_FATAL),1),,-)$(GJSLINT) $<
endif
@mkdir -p $(@D)
touch $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment