Skip to content

Commit e78b7cc

Browse files
tom93eldering
authored andcommitted
Reorganise webapp/Makefile
Just moving around the lines, no functional changes.
1 parent 1b06d6c commit e78b7cc

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

webapp/Makefile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ SUBDIRS = config
1111

1212
domserver: composer-dump-autoload
1313

14-
maintainer-conf: .env.local
14+
# Install PHP dependencies
15+
composer-dependencies:
16+
ifeq (, $(shell command -v composer 2> /dev/null))
17+
$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
18+
endif
19+
# We use --no-scripts here because at this point the autoload.php file is
20+
# not generated yet, which is needed to run the post-install scripts.
21+
composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
1522

16-
# Run Symfony in dev mode (for maintainer-mode):
17-
.env.local:
18-
@echo "Creating file '$@'..."
19-
@echo "# This file was automatically created by 'make maintainer-conf' to run" > $@
20-
@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
21-
@echo "APP_ENV=dev" >> $@
23+
composer-dependencies-dev:
24+
composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
2225

2326
# Dump autoload dependencies (including plugins)
2427
# This is needed since symfony/runtime is a Composer plugin that runs while dumping
@@ -33,6 +36,13 @@ vendor/autoload_runtime.php:
3336
composer-dump-autoload-dev:
3437
composer $(subst 1,-q,$(QUIET)) dump-autoload
3538

39+
# Run Symfony in dev mode (for maintainer-mode):
40+
.env.local:
41+
@echo "Creating file '$@'..."
42+
@echo "# This file was automatically created by 'make maintainer-conf' to run" > $@
43+
@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
44+
@echo "APP_ENV=dev" >> $@
45+
3646
copy-bundle-assets:
3747
# We can not use bin/console here, as when using a fakeroot,
3848
# the include paths are broken. We just copy in the data we need
@@ -65,19 +75,9 @@ install-domserver:
6575
done
6676
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
6777

68-
maintainer-install: composer-dump-autoload-dev
69-
70-
# Install PHP dependencies
71-
composer-dependencies:
72-
ifeq (, $(shell command -v composer 2> /dev/null))
73-
$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
74-
endif
75-
# We use --no-scripts here because at this point the autoload.php file is
76-
# not generated yet, which is needed to run the post-install scripts.
77-
composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
78+
maintainer-conf: .env.local
7879

79-
composer-dependencies-dev:
80-
composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
80+
maintainer-install: composer-dump-autoload-dev
8181

8282
maintainer-clean-l:
8383
-for d in cache log ; do \

0 commit comments

Comments
 (0)