Skip to content

Cleanup vendor symlink renaming #2837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 23, 2024
Merged

Cleanup vendor symlink renaming #2837

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b997461
Clean up rename of symlinks to vendor dir
eldering Nov 23, 2024
2b3e5dc
Simplify (re)creating webapp/public/doc symlink
eldering Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions webapp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,7 @@ install-domserver:
$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \
done
# Change webapp/public/doc symlink
rm $(DESTDIR)$(domserver_webappdir)/public/doc
ln -s $(domjudge_docdir) $(DESTDIR)$(domserver_webappdir)/public/doc
# Now change all relative symlinks in webapp/public to their correct paths
for link in $$(find $(DESTDIR)$(domserver_webappdir)/public/$$dir -maxdepth 2 -type l); do \
target=$$(readlink $$link) ; \
case $${target} in *../vendor*) \
rm $$link ; \
realtarget=$(domserver_webappdir)/vendor$${target#*../vendor} ; \
ln -s $$realtarget $$link ; \
esac \
done
ln -sf $(domjudge_docdir) $(DESTDIR)$(domserver_webappdir)/public/doc
$(INSTALL_DATA) -t $(DESTDIR)$(domserver_webappdir) phpunit.xml.dist .env

maintainer-conf: .env.local
Expand Down
Loading