X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=83c5f37ad78610d12e49211d3f6c0fc1b8bb752f;hb=2fe2e411a74d541ddd7eee2aca1b80ac58de49eb;hp=f7f6138dd593f843147f3d3a0ab72d6b6ad7170f;hpb=4e7863c6aa0010c22e471a84859217e1ca8227b8;p=github%2Fwallabag%2Fwallabag.git

diff --git a/Makefile b/Makefile
index f7f6138d..83c5f37a 100755
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-ENV=prod
+ifndef ENV
+	ENV=prod
+endif
 
 help: ## Display this help menu
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -15,14 +17,18 @@ install: ## Install wallabag with the latest version
 update: ## Update the wallabag installation to the latest version
 	@sh scripts/update.sh $(ENV)
 
-run: ## Run the wallabag server
-	php bin/console server:run --env=$(ENV)
+dev: ## Install the latest dev version
+	@sh scripts/dev.sh
+
+run: ## Run the wallabag built-in server
+	@php bin/console server:run --env=$(ENV)
 
 build: ## Run grunt
 	@grunt
 
 test: ## Launch wallabag testsuite
-	@ant prepare && phpunit -v
+	@if [ ! -d "vendor/phpunit" ]; then composer install; fi
+	@ant prepare && vendor/phpunit/phpunit/phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -35,4 +41,6 @@ travis: ## Make some stuff for Travis-CI
 deploy: ## Deploy wallabag
 	@bundle exec cap staging deploy
 
-.PHONY: help clean install update build test release travis deploy
+.PHONY: help clean install update build test release travis deploy run dev
+
+.DEFAULT_GOAL := install