diff options
author | Olivier Mehani <shtrom@ssji.net> | 2018-08-18 15:39:37 +1000 |
---|---|---|
committer | Olivier Mehani <shtrom@ssji.net> | 2018-08-18 18:50:18 +1000 |
commit | 681e04b0605d2e526f6adc2f99c2ff8fc9e842a7 (patch) | |
tree | fd9d76795da3090b7321820960306da4d733cb0b | |
parent | 1421236800ce3a930cad8913ad64d38cd37f7884 (diff) | |
download | wallabag-681e04b0605d2e526f6adc2f99c2ff8fc9e842a7.tar.gz wallabag-681e04b0605d2e526f6adc2f99c2ff8fc9e842a7.tar.zst wallabag-681e04b0605d2e526f6adc2f99c2ff8fc9e842a7.zip |
Makefile fixes for non GNU systems
* Move `Makefile` to `GNUmakefile`, which GNU `make` picks first
* Add `Makefile` so other `make`s forward to `gmake`
* Set the `SHELL` variable and let `make` handle the shell
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
-rwxr-xr-x | GNUmakefile | 53 | ||||
-rw-r--r--[-rwxr-xr-x] | Makefile | 54 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/dev.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/install.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/release.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/require.sh | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/update.sh | 0 |
7 files changed, 55 insertions, 52 deletions
diff --git a/GNUmakefile b/GNUmakefile new file mode 100755 index 00000000..a04468cb --- /dev/null +++ b/GNUmakefile | |||
@@ -0,0 +1,53 @@ | |||
1 | SHELL=bash | ||
2 | TMP_FOLDER=/tmp | ||
3 | RELEASE_FOLDER=wllbg-release | ||
4 | |||
5 | ENV ?= prod | ||
6 | |||
7 | help: ## Display this help menu | ||
8 | @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | ||
9 | |||
10 | clean: ## Clear the application cache | ||
11 | rm -rf var/cache/* | ||
12 | |||
13 | install: ## Install wallabag with the latest version | ||
14 | @./scripts/install.sh $(ENV) | ||
15 | |||
16 | update: ## Update the wallabag installation to the latest version | ||
17 | @./scripts/update.sh $(ENV) | ||
18 | |||
19 | dev: ## Install the latest dev version | ||
20 | @./scripts/dev.sh | ||
21 | |||
22 | run: ## Run the wallabag built-in server | ||
23 | @php bin/console server:run --env=dev | ||
24 | |||
25 | build: ## Run webpack | ||
26 | @npm run build:$(ENV) | ||
27 | |||
28 | prepare: clean ## Prepare database for testsuite | ||
29 | ifdef DB | ||
30 | cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml | ||
31 | endif | ||
32 | -php bin/console doctrine:database:drop --force --env=test | ||
33 | php bin/console doctrine:database:create --env=test | ||
34 | php bin/console doctrine:migrations:migrate --no-interaction --env=test | ||
35 | |||
36 | fixtures: ## Load fixtures into database | ||
37 | php bin/console doctrine:fixtures:load --no-interaction --env=test | ||
38 | |||
39 | test: prepare fixtures ## Launch wallabag testsuite | ||
40 | bin/simple-phpunit -v | ||
41 | |||
42 | release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). | ||
43 | ifndef VERSION | ||
44 | $(error VERSION is not set) | ||
45 | endif | ||
46 | @./scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV) | ||
47 | |||
48 | deploy: ## Deploy wallabag | ||
49 | @bundle exec cap staging deploy | ||
50 | |||
51 | .PHONY: help clean prepare install fixtures update build test release deploy run dev | ||
52 | |||
53 | .DEFAULT_GOAL := install | ||
@@ -1,52 +1,2 @@ | |||
1 | TMP_FOLDER=/tmp | 1 | .DEFAULT: |
2 | RELEASE_FOLDER=wllbg-release | 2 | gmake $@ |
3 | |||
4 | ENV ?= prod | ||
5 | |||
6 | help: ## Display this help menu | ||
7 | @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | ||
8 | |||
9 | clean: ## Clear the application cache | ||
10 | rm -rf var/cache/* | ||
11 | |||
12 | install: ## Install wallabag with the latest version | ||
13 | @sh scripts/install.sh $(ENV) | ||
14 | |||
15 | update: ## Update the wallabag installation to the latest version | ||
16 | @sh scripts/update.sh $(ENV) | ||
17 | |||
18 | dev: ## Install the latest dev version | ||
19 | @sh scripts/dev.sh | ||
20 | |||
21 | run: ## Run the wallabag built-in server | ||
22 | @php bin/console server:run --env=dev | ||
23 | |||
24 | build: ## Run webpack | ||
25 | @npm run build:$(ENV) | ||
26 | |||
27 | prepare: clean ## Prepare database for testsuite | ||
28 | ifdef DB | ||
29 | cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml | ||
30 | endif | ||
31 | -php bin/console doctrine:database:drop --force --env=test | ||
32 | php bin/console doctrine:database:create --env=test | ||
33 | php bin/console doctrine:migrations:migrate --no-interaction --env=test | ||
34 | |||
35 | fixtures: ## Load fixtures into database | ||
36 | php bin/console doctrine:fixtures:load --no-interaction --env=test | ||
37 | |||
38 | test: prepare fixtures ## Launch wallabag testsuite | ||
39 | bin/simple-phpunit -v | ||
40 | |||
41 | release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`). | ||
42 | ifndef VERSION | ||
43 | $(error VERSION is not set) | ||
44 | endif | ||
45 | @sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV) | ||
46 | |||
47 | deploy: ## Deploy wallabag | ||
48 | @bundle exec cap staging deploy | ||
49 | |||
50 | .PHONY: help clean prepare install fixtures update build test release deploy run dev | ||
51 | |||
52 | .DEFAULT_GOAL := install | ||
diff --git a/scripts/dev.sh b/scripts/dev.sh index 0703ced1..0703ced1 100644..100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh | |||
diff --git a/scripts/install.sh b/scripts/install.sh index 62a46f4f..62a46f4f 100644..100755 --- a/scripts/install.sh +++ b/scripts/install.sh | |||
diff --git a/scripts/release.sh b/scripts/release.sh index bfb65684..bfb65684 100644..100755 --- a/scripts/release.sh +++ b/scripts/release.sh | |||
diff --git a/scripts/require.sh b/scripts/require.sh index c48ab936..c48ab936 100644..100755 --- a/scripts/require.sh +++ b/scripts/require.sh | |||
diff --git a/scripts/update.sh b/scripts/update.sh index d0598135..d0598135 100644..100755 --- a/scripts/update.sh +++ b/scripts/update.sh | |||