Use broccoli for ui make tasks

This commit is contained in:
Joe Fiorini 2015-02-05 15:25:44 -05:00
parent 13998e2898
commit 81c940e36b

View File

@ -3,6 +3,7 @@ SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; pr
OFFICIAL ?= no
PACKER ?= packer
GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color")
BROCCOLI ?= broccoli
# Get the branch information from git
GIT_DATE := $(shell git log -n 1 --format="%ai")
@ -89,7 +90,7 @@ clean-grunt:
# Remove UI build files
clean-ui:
rm -f awx/ui/static/{js,css}/awx*.{js,css}
rm -rf awx/ui/static/dist
rm -rf awx/ui/static/docs
# Remove temporary build files, compiled Python files.
@ -271,9 +272,11 @@ package.json:
node_modules: Gruntfile.js bower.json package.json
npm install
devjs: node_modules clean-ui
$(BROCCOLI) build awx/ui/static/dist -- --debug
# Build minified JS/CSS.
minjs: node_modules
$(GRUNT)
minjs: node_modules clean-ui
$(BROCCOLI) build awx/ui/static/dist -- --silent --no-debug --no-tests --compress
# Check .js files for errors and lint
jshint: node_modules