Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Use NPM bin directory in Makefile.
Browse files Browse the repository at this point in the history
The Makefile was not calling explicitly the scripts installed by NPM.
  • Loading branch information
Carlos Andrés Rocha committed Nov 6, 2014
1 parent 67c1110 commit f00cbb7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"directory": "analytics_dashboard/static/bower_components",
"interactive": false,
"scripts": {
"postinstall": "./bower-post-install.sh"
}
Expand Down
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ROOT = $(shell echo "$$PWD")
COVERAGE = $(ROOT)/build/coverage
PACKAGES = analytics_dashboard courses django_rjs help
NUM_PROCESSES = 2
NODE_BIN=./node_modules/.bin

.PHONY: requirements clean

Expand All @@ -12,7 +13,7 @@ requirements: requirements.js

requirements.js:
npm install
bower install
$(NODE_BIN)/bower install

test.requirements: requirements
pip install -q -r requirements/test.txt --exists-action w
Expand Down Expand Up @@ -55,9 +56,9 @@ quality:
validate_python: test.requirements test_python quality

validate_js: requirements.js
gulp test
gulp lint
gulp jscs
$(NODE_BIN)/gulp test
$(NODE_BIN)/gulp lint
$(NODE_BIN)/gulp jscs

validate: validate_python validate_js

Expand All @@ -75,6 +76,6 @@ generate_fake_translations:
compile_translations

static:
r.js -o build.js
$(NODE_BIN)/r.js -o build.js
cd analytics_dashboard && ./manage.py collectstatic --noinput
cd analytics_dashboard && ./manage.py compress

0 comments on commit f00cbb7

Please sign in to comment.