From 4dcc6938dd9d1ef8dec6d1687df9b8f930a49036 Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 6 Mar 2014 08:56:02 -0500 Subject: [PATCH] Allow customizing grunt cli options Automation can now set GRUNT to provide a path to a specific grunt binary, or to add grunt parameters. For example, to disable color output during a Jenkins build: GRUNT="grunt --no-color" make lintjs --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2a6df4e493..4f0e2934f6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PYTHON=python SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") PACKER ?= packer +GRUNT ?= grunt # Get the branch information from git GIT_DATE := $(shell git log -n 1 --format="%ai") @@ -152,11 +153,11 @@ node_modules: package.json # Build minified JS/CSS. minjs: node_modules - grunt + $(GRUNT) # Check .js files for errors and lint lintjs: node_modules - grunt jshint + $(GRUNT) jshint # Build a pip-installable package into dist/ with a timestamped version number. dev_build: