Skip to content

Commit 3d69b44

Browse files
Michael Vasseurvmcj
authored andcommitted
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 628e5dc commit 3d69b44

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
@@ -102,7 +102,7 @@ install-judgehost: SUBDIRS=etc lib judge misc-tools
102102
docs: SUBDIRS= doc
103103
install-docs: SUBDIRS= doc
104104
maintainer-conf: SUBDIRS= webapp
105-
inplace-install: SUBDIRS= doc misc-tools
105+
inplace-install: SUBDIRS= doc misc-tools webapp
106106
inplace-uninstall: SUBDIRS= doc misc-tools
107107
dist: SUBDIRS= lib sql misc-tools
108108
clean: SUBDIRS=etc doc lib sql judge misc-tools webapp
@@ -227,8 +227,6 @@ inplace-install-l:
227227
# because judgehost-create-dirs sets wrong permissions:
228228
$(MKDIR_P) $(domserver_tmpdir)
229229
chmod a+rwx $(domserver_tmpdir)
230-
# Make sure we're running from a clean state:
231-
composer auto-scripts
232230
@echo ""
233231
@echo "========== Maintainer Install Completed =========="
234232
@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)