From 7870742af6738a595a58facf006829d0f35f28e0 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 3 Jan 2017 15:21:41 -0200 Subject: Adds javascript build and tests to makefile Now you can setup both javascript and python from scratch and run the test suites on both sides directly from the root of the project --- web-ui/_trial_temp/_trial_marker | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 web-ui/_trial_temp/_trial_marker (limited to 'web-ui') diff --git a/web-ui/_trial_temp/_trial_marker b/web-ui/_trial_temp/_trial_marker deleted file mode 100755 index e69de29b..00000000 -- cgit v1.2.3 From 8e2f0852f173aca560f71e871ceab1d471a8b206 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Tue, 3 Jan 2017 18:58:52 -0200 Subject: Moved bower install to npm post_install Also fixed some indentation errors on the Makefile --- web-ui/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web-ui') 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" } } -- cgit v1.2.3