diff options
| author | Bruno Wagner <bwagner@riseup.net> | 2017-01-03 18:58:52 -0200 |
|---|---|---|
| committer | Bruno Wagner <bwagner@riseup.net> | 2017-01-03 18:58:52 -0200 |
| commit | 8e2f0852f173aca560f71e871ceab1d471a8b206 (patch) | |
| tree | f27fa74ffa1da437ae93e7814f194b3dcd2310b3 /Makefile | |
| parent | cb21017d3affd6ff51c47de36913311206c865df (diff) | |
Moved bower install to npm post_install
Also fixed some indentation errors on the Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -28,8 +28,7 @@ install_py: service/requirements.txt service/test_requirements.txt requirements_js: @echo "Installing javascript npm and bower dependencies" @cd web-ui;\ - npm install;\ - node_modules/.bin/bower install + npm install .PHONY: install_js install_js: @@ -43,7 +42,7 @@ create_virtualenv: ensure_virtualenv_installed echo "Pixelated virtualenv doesn't exist, creating now";\ virtualenv --python=python2 $(VIRTUALENV);\ else\ - echo "Pixelated virtualenv already exists, moving on";\ + echo "Pixelated virtualenv already exists, moving on";\ fi .PHONY: test @@ -91,7 +90,7 @@ unit_tests_py: unit_tests_js: @echo "Running javascript unit tests" @cd web-ui;\ - npm run test + npm run test .PHONY: integration_tests_py integration_tests: @@ -119,7 +118,7 @@ ensure_virtualenv_installed: @if [ ! `which virtualenv` ]; then\ exit 1;\ else\ - echo "Virtualenv located at "`which virtualenv`;\ + echo "Virtualenv located at "`which virtualenv`;\ fi .PHONY: clean @@ -134,8 +133,8 @@ clean_all: clean remove_javascript_packages remove_virtualenv clean_py: rm -rf service/_trial_temp find . -name "*.pyc" -delete - @source $(VIRTUALENV)/bin/activate;\ rm -rf service/.coverage + rm -rf service/htmlcov .PHONY: clean_js clean_js: |