Merge "Add support for conditionally failing on JSLint errors"

clear_xpcom_vars.mk

@@ -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 :=

xpcom.mk

@@ -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 $@