From 4df13d7e99b4ad4b78ae170ecee5c22bde8b8dad Mon Sep 17 00:00:00 2001 From: James Laska Date: Mon, 17 Feb 2014 10:18:33 -0500 Subject: [PATCH] Add 'npm install' task to the make process Also, clean up node_modules/ and other generated .js and .css files during 'make clean'. --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 50d8caa9d1..b4abd0e2d1 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,8 @@ clean: rm -rf dist/* rm -rf build rpm-build *.egg-info rm -rf debian deb-build - rm -f awx/ui/static/js/awx-min.js + rm -f awx/ui/static/css/awx*.js awx/ui/static/css/awx*.css + rm -rf node_modules find . -type f -regex ".*\.py[co]$$" -delete # Fetch from origin, rebase local commits on top of origin commits. @@ -137,17 +138,20 @@ test_tox: test_jenkins: $(PYTHON) manage.py jenkins -v2 +# Update local npm install +node_modules: + npm install + # Build minified JS/CSS. -minjs: +minjs: node_modules grunt -# Check .js files for errors and lint -lintjs: +# Check .js files for errors and lint +lintjs: node_modules grunt jshint - # Build a pip-installable package into dist/ with a timestamped version number. -dev_build: +dev_build: $(PYTHON) setup.py dev_build # Build a pip-installable package into dist/ with the release version number.