aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOlivier Mehani <shtrom@ssji.net>2019-08-29 21:27:56 +1000
committerOlivier Mehani <shtrom@ssji.net>2019-08-29 21:27:56 +1000
commitb1574a39877d69cdf54111b0fb108039c21eae5f (patch)
treea9bf77d3932c919dce57cc63b0f2280bbeae22e9
parente337267d7617cf7e53e72c2cfc4125d37e0235fc (diff)
downloadwallabag-b1574a39877d69cdf54111b0fb108039c21eae5f.tar.gz
wallabag-b1574a39877d69cdf54111b0fb108039c21eae5f.tar.zst
wallabag-b1574a39877d69cdf54111b0fb108039c21eae5f.zip
Make dev depend on build
Also, run `npm install` before building. Signed-off-by: Olivier Mehani <shtrom@ssji.net>
-rwxr-xr-xGNUmakefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a04468cb..15d737db 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -16,13 +16,15 @@ install: ## Install wallabag with the latest version
16update: ## Update the wallabag installation to the latest version 16update: ## Update the wallabag installation to the latest version
17 @./scripts/update.sh $(ENV) 17 @./scripts/update.sh $(ENV)
18 18
19dev: ## Install the latest dev version 19dev: ENV=dev
20dev: build ## Install the latest dev version
20 @./scripts/dev.sh 21 @./scripts/dev.sh
21 22
22run: ## Run the wallabag built-in server 23run: ## Run the wallabag built-in server
23 @php bin/console server:run --env=dev 24 @php bin/console server:run --env=dev
24 25
25build: ## Run webpack 26build: ## Run webpack
27 @npm install
26 @npm run build:$(ENV) 28 @npm run build:$(ENV)
27 29
28prepare: clean ## Prepare database for testsuite 30prepare: clean ## Prepare database for testsuite