diff options
-rw-r--r-- | Makefile | 11 | ||||
-rwxr-xr-x | service/go | 1 | ||||
-rw-r--r-- | web-ui/package.json | 3 |
3 files changed, 8 insertions, 7 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: @@ -27,4 +27,5 @@ elif [ "$1" == "functional" ]; then popd else echo "Command doesn't exist" + exit 1 fi diff --git a/web-ui/package.json b/web-ui/package.json index 3d1720e1..d67114cc 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -62,6 +62,7 @@ "clean": "rm -rf dist/ app/js/generated/hbs/* app/css/*", "package": "PIXELATED_BUILD='package' npm run build-prod && npm run imagemin", "imagemin": "node config/imagemin.js", - "add_git_version": "/bin/bash config/add_git_version.sh" + "add_git_version": "/bin/bash config/add_git_version.sh", + "postinstall" : "bower install" } } |