Skip to content

Commit ad0171c

Browse files
author
Michael Vasseur
committed
Make sure we do a composer clean first
If I understand the logic correctly this will make sure we run this step before the actual other steps, so first all dependencies are done (with the clean state) and then the inplace-install itself.
1 parent 42dbc79 commit ad0171c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ install-judgehost: SUBDIRS=etc lib judge misc-tools
108108
docs: SUBDIRS= doc
109109
install-docs: SUBDIRS= doc
110110
maintainer-conf: SUBDIRS= webapp
111-
inplace-install: SUBDIRS= doc misc-tools
111+
inplace-install: SUBDIRS= doc misc-tools webapp
112112
inplace-uninstall: SUBDIRS= doc misc-tools
113113
dist: SUBDIRS= lib sql misc-tools
114114
clean: SUBDIRS=etc doc lib sql judge misc-tools webapp
@@ -233,8 +233,6 @@ inplace-install-l:
233233
# because judgehost-create-dirs sets wrong permissions:
234234
$(MKDIR_P) $(domserver_tmpdir)
235235
chmod a+rwx $(domserver_tmpdir)
236-
# Make sure we're running from a clean state:
237-
composer auto-scripts
238236
@echo ""
239237
@echo "========== Maintainer Install Completed =========="
240238
@echo ""

webapp/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ install-domserver:
4949
done
5050
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env
5151

52+
inplace-install: composer-autoclean
53+
54+
composer-autoclean:
55+
# Make sure we're running from a clean state:
56+
composer auto-scripts
57+
5258
maintainer-clean-l:
5359
-for d in cache log ; do \
5460
for t in dev prod ; do \

0 commit comments

Comments
 (0)