Skip to content

Commit 50713ae

Browse files
author
Michael Vasseur
committed
Run the autoload from the webapp folder
1 parent 90893b3 commit 50713ae

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,6 @@ ifneq "$(JUDGEHOST_BUILD_ENABLED)" "yes"
6565
@exit 1
6666
endif
6767

68-
# Dump autoload dependencies (including plugins)
69-
# This is needed since symfony/runtime is a Composer plugin that runs while dumping
70-
# the autoload file
71-
composer-dump-autoload:
72-
composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
73-
74-
composer-dump-autoload-dev:
75-
composer $(subst 1,-q,$(QUIET)) dump-autoload
76-
7768
# Generate documentation for distribution. Remove this dependency from
7869
# dist above for quicker building from git sources.
7970
distdocs:
@@ -97,6 +88,7 @@ install-judgehost: SUBDIRS=etc lib judge misc-tools
9788
docs: SUBDIRS= doc
9889
install-docs: SUBDIRS= doc
9990
maintainer-conf: SUBDIRS= webapp
91+
maintainer-install: SUBDIRS= webapp
10092
inplace-install: SUBDIRS= doc misc-tools webapp
10193
inplace-uninstall: SUBDIRS= doc misc-tools
10294
dist: SUBDIRS= lib sql misc-tools

webapp/Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ maintainer-conf: .env.local
1818
@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
1919
@echo "APP_ENV=dev" >> $@
2020

21+
# Dump autoload dependencies (including plugins)
22+
# This is needed since symfony/runtime is a Composer plugin that runs while dumping
23+
# the autoload file
24+
composer-dump-autoload:
25+
composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
26+
27+
composer-dump-autoload-dev:
28+
composer $(subst 1,-q,$(QUIET)) dump-autoload
29+
2130
copy-bundle-assets:
2231
# We can not use bin/console here, as when using a fakeroot,
2332
# the include paths are broken. We just copy in the data we need
@@ -28,7 +37,7 @@ copy-bundle-assets:
2837
clean-l:
2938
-rm -rf public/bundles/nelmioapidoc
3039

31-
install-domserver:
40+
install-domserver: composer-dump-autoload
3241
# This must be done first to install with the rest.
3342
$(MAKE) copy-bundle-assets
3443
$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
@@ -49,7 +58,8 @@ install-domserver:
4958
done
5059
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
5160

52-
inplace-install: composer-autoclean
61+
inplace-install: composer-autoclean composer-dump-autoload
62+
maintainer-install: composer-dump-autoload-dev
5363

5464
# Install PHP dependencies
5565
composer-dependencies:

0 commit comments

Comments
 (0)