summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-07-10 17:58:48 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-07-10 17:59:38 +0200
commit4a18b132193f83b1bc3685ba6e5c0f3bb996ff5c (patch)
tree45fe6fa4fa737e5814cc35b7b48593242a3355f2 /Makefile
parentb8f4a677a8fb7fe18373cce7a822296717df6526 (diff)
Fix makefile
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1bb15ca4..40c19329 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,10 @@ source_package_name=$(source_build_directory)/$(app_name)
appstore_build_directory=$(CURDIR)/build/artifacts/appstore
appstore_package_name=$(appstore_build_directory)/$(app_name)
-all: dev-setup lint build-js-production test-php
+all: dev-setup lint build-js-production install-composer-deps-dev test-php
# Dev env management
-dev-setup: clean clean-dev npm-init
-
-npm-init:
- npm ci
+dev-setup: clean clean-dev install-npm-deps-dev
npm-update:
npm update
@@ -25,6 +22,9 @@ composer.phar:
install-deps: install-composer-deps-dev install-npm-deps-dev
+install-npm-deps-dev:
+ npm ci
+
install-composer-deps: composer.phar
php composer.phar install --no-dev -o
@@ -79,6 +79,7 @@ clean:
clean-dev:
rm -rf node_modules
+ rm -rf vendor
# Builds the source package for the app store, ignores php and js tests
appstore: