Skip to content

Commit

Permalink
Reorganise webapp/Makefile
Browse files Browse the repository at this point in the history
Just moving around the lines, no functional changes.
  • Loading branch information
tom93 committed Jul 29, 2024
1 parent 861b039 commit 43cf9a3
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions webapp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ SUBDIRS = config

domserver: composer-dump-autoload

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

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

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

# Run Symfony in dev mode (for maintainer-mode):
.env.local:
@echo "Creating file '$@'..."
@echo "# This file was automatically created by 'make maintainer-conf' to run" > $@
@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
@echo "APP_ENV=dev" >> $@

copy-bundle-assets:
# We can not use bin/console here, as when using a fakeroot,
# the include paths are broken. We just copy in the data we need
Expand Down Expand Up @@ -65,19 +75,9 @@ install-domserver:
done
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env

maintainer-install: composer-dump-autoload-dev

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

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

maintainer-clean-l:
-for d in cache log ; do \
Expand Down

0 comments on commit 43cf9a3

Please sign in to comment.