X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Makefile;h=ffbe102a045c05f09ca3201322592e3ff153a111;hb=b9c26b6330f688ce18af65a05a821f70dd73259c;hp=a4a06e3fa42c8a4af5484433b9234d849853114a;hpb=26490a8794e762a77bb0439790db641a222fb0ef;p=github%2Fwallabag%2Fwallabag.git

diff --git a/Makefile b/Makefile
index a4a06e3f..ffbe102a 100755
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,9 @@
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 
-SSH_USER=framasoft_bag
-SSH_HOST=78.46.248.87
-SSH_PATH=/var/www/framabag.org/web
-
-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}'
@@ -14,48 +12,34 @@ clean: ## Clear the application cache
 	@rm -rf var/cache/*
 
 install: ## Install wallabag with the latest version
-	TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
-	@git checkout $(TAG)
-	@SYMFONY_ENV=$(ENV) composer install --no-dev -o --prefer-dist
-	@php bin/console wallabag:install --env=$(ENV)
+	@sh scripts/install.sh $(ENV)
 
 update: ## Update the wallabag installation to the latest version
-	@rm -rf var/cache/*
-	@git fetch origin
-	@git fetch --tags
-	TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
-	@git checkout $(TAG)
-	@SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-	@php bin/console cache:clear --env=prod
+	@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
 
-build: ## Run grunt
-	@grunt
+run: ## Run the wallabag built-in server
+	@php bin/console server:run --env=$(ENV)
+
+build: ## Run webpack
+	@npm run build:$(ENV)
 
 test: ## Launch wallabag testsuite
-	@ant prepare && phpunit -v
+	@ant prepare && bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
 	$(error VERSION is not set)
 endif
-	version=$(VERSION)
-	@rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER)
-	@mkdir $(TMP_FOLDER)/$(RELEASE_FOLDER)
-	@git clone git@github.com:wallabag/wallabag.git -b $(VERSION) $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION)
-	@cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && SYMFONY_ENV=$(ENV) composer up -n --no-dev
-	@cd $(TMP_FOLDER)/$(RELEASE_FOLDER)/$(VERSION) && php bin/console wallabag:install --env=$(ENV)
-	@cd $(TMP_FOLDER)/$(RELEASE_FOLDER) && tar czf wallabag-$(VERSION).tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $(VERSION)
-	@echo "MD5 checksum of the package for wallabag $(VERSION)"
-	@md5 $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz
-	@scp $(TMP_FOLDER)/$(RELEASE_FOLDER)/wallabag-$(VERSION).tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_PATH)
-	@rm -rf $(TMP_FOLDER)/$(RELEASE_FOLDER)
+	@sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
 
 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