Skip to content

Commit a81e6a2

Browse files
committed
Try to fix the install
1 parent 57dc230 commit a81e6a2

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Makefile

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,6 @@ ifneq "$(JUDGEHOST_BUILD_ENABLED)" "yes"
6464
@exit 1
6565
endif
6666

67-
# Install PHP dependencies
68-
composer-dependencies:
69-
ifeq (, $(shell command -v composer 2> /dev/null))
70-
$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
71-
endif
72-
# We use --no-scripts here because at this point the autoload.php file is
73-
# not generated yet, which is needed to run the post-install scripts.
74-
composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
75-
76-
composer-dependencies-dev:
77-
composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
78-
79-
# Dump autoload dependencies (including plugins)
80-
# This is needed since symfony/runtime is a Composer plugin that runs while dumping
81-
# the autoload file
82-
composer-dump-autoload:
83-
composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
84-
85-
composer-dump-autoload-dev:
86-
composer $(subst 1,-q,$(QUIET)) dump-autoload
87-
8867
# Generate documentation for distribution. Remove this dependency from
8968
# dist above for quicker building from git sources.
9069
distdocs:

webapp/Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ include $(TOPDIR)/Makefile.global
99
# Subdirectories to recurse into for REC_TARGETS
1010
SUBDIRS = config
1111

12+
# Install PHP dependencies
13+
composer-dependencies:
14+
ifeq (, $(shell command -v composer 2> /dev/null))
15+
$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
16+
endif
17+
# We use --no-scripts here because at this point the autoload.php file is
18+
# not generated yet, which is needed to run the post-install scripts.
19+
composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
20+
21+
composer-dependencies-dev:
22+
composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
23+
24+
# Dump autoload dependencies (including plugins)
25+
# This is needed since symfony/runtime is a Composer plugin that runs while dumping
26+
# the autoload file
27+
composer-dump-autoload:
28+
composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
29+
30+
composer-dump-autoload-dev:
31+
composer $(subst 1,-q,$(QUIET)) dump-autoload
32+
1233
copy-bundle-assets:
1334
# We can not use bin/console here, as when using a fakeroot,
1435
# the include paths are broken. We just copy in the data we need

0 commit comments

Comments
 (0)