lib/vendor should not show up in the configure

Author: Michael Vasseur

Makefile

@@ -5,7 +5,8 @@
 export TOPDIR = $(shell pwd)
 
 REC_TARGETS=build domserver install-domserver judgehost install-judgehost \
-            docs install-docs inplace-install inplace-uninstall maintainer-conf
+            docs install-docs inplace-install inplace-uninstall maintainer-conf \
+            composer-dump-autoload composer-dump-autoload-dev
 
 # Global Makefile definitions
 include $(TOPDIR)/Makefile.global
@@ -50,7 +51,7 @@ docs: paths.mk config
 install-domserver: domserver composer-dump-autoload domserver-create-dirs
 install-judgehost: judgehost judgehost-create-dirs
 install-docs: docs-create-dirs
-dist: configure composer-dependencies
+dist: configure
 
 domserver-configure:
 ifneq "$(DOMSERVER_BUILD_ENABLED)" "yes"
@@ -64,27 +65,6 @@ ifneq "$(JUDGEHOST_BUILD_ENABLED)" "yes"
 	@exit 1
 endif
 
-# Install PHP dependencies
-composer-dependencies:
-ifeq (, $(shell command -v composer 2> /dev/null))
-	$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
-endif
-# We use --no-scripts here because at this point the autoload.php file is
-# not generated yet, which is needed to run the post-install scripts.
-	composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
-
-composer-dependencies-dev:
-	composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
-
-# Dump autoload dependencies (including plugins)
-# This is needed since symfony/runtime is a Composer plugin that runs while dumping
-# the autoload file
-composer-dump-autoload:
-	composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
-
-composer-dump-autoload-dev:
-	composer $(subst 1,-q,$(QUIET)) dump-autoload
-
 # Generate documentation for distribution. Remove this dependency from
 # dist above for quicker building from git sources.
 distdocs:
@@ -108,12 +88,16 @@ install-judgehost:          SUBDIRS=etc     lib     judge misc-tools
 docs:                       SUBDIRS=    doc
 install-docs:               SUBDIRS=    doc
 maintainer-conf:            SUBDIRS=                                 webapp
+inplace-conf:               SUBDIRS=                                 webapp
 inplace-install:            SUBDIRS=    doc               misc-tools
 inplace-uninstall:          SUBDIRS=    doc               misc-tools
-dist:                       SUBDIRS=        lib sql       misc-tools
+dist:                       SUBDIRS=        lib sql       misc-tools webapp
 clean:                      SUBDIRS=etc doc lib sql judge misc-tools webapp
 distclean:                  SUBDIRS=etc doc lib sql judge misc-tools webapp
 maintainer-clean:           SUBDIRS=etc doc lib sql judge misc-tools webapp
+composer-clean:             SUBDIRS=                                 webapp
+composer-dump-autoload:     SUBDIRS=                                 webapp
+composer-dump-autoload-dev: SUBDIRS=                                 webapp
 
 domserver-create-dirs:
 	$(INSTALL_DIR) $(addprefix $(DESTDIR),$(domserver_dirs))
@@ -194,8 +178,8 @@ paths.mk:
 	@exit 1
 
 # Configure for running in source tree, not meant for normal use:
-maintainer-conf: inplace-conf-common composer-dependencies-dev
-inplace-conf: inplace-conf-common composer-dependencies
+maintainer-conf: inplace-conf-common
+inplace-conf: inplace-conf-common
 inplace-conf-common: dist
 	./configure $(subst 1,-q,$(QUIET)) --prefix=$(CURDIR) \
 	            --with-domserver_root=$(CURDIR) \
@@ -216,7 +200,7 @@ inplace-conf-common: dist
 # symlinks where necessary to let it work from the source tree.
 # This stuff is a hack!
 maintainer-install: inplace-install composer-dump-autoload-dev
-inplace-install: build composer-dump-autoload domserver-create-dirs judgehost-create-dirs
+inplace-install: build composer-dump-autoload domserver-create-dirs judgehost-create-dirs composer-clean
 inplace-install-l:
 # Replace libjudgedir with symlink to prevent lots of symlinks:
 	-rmdir $(judgehost_libjudgedir)
@@ -234,7 +218,6 @@ inplace-install-l:
 	$(MKDIR_P) $(domserver_tmpdir)
 	chmod a+rwx $(domserver_tmpdir)
 # Make sure we're running from a clean state:
-	composer auto-scripts
 	@echo ""
 	@echo "========== Maintainer Install Completed =========="
 	@echo ""
@@ -334,6 +317,5 @@ clean-autoconf:
 .PHONY: $(addsuffix -create-dirs,domserver judgehost docs) check-root \
         $(addprefix inplace-,conf conf-common install uninstall) \
         $(addprefix maintainer-,conf install) clean-autoconf config distdocs \
-        composer-dependencies composer-dependencies-dev \
         composer-dump-autoload composer-dump-autoload-dev \
-        coverity-conf coverity-build
+        coverity-conf coverity-build composer-clean

README.md

@@ -72,7 +72,7 @@ The M4 autoconf macros are licensed under all-permissive and GPL3+
 licences; see the respective files under m4/ for details.
 
 The DOMjudge tarball ships external library dependencies in the
-lib/vendor directory. These are covered by their individual licenses
+webapp/vendor directory. These are covered by their individual licenses
 as specified in the file composer.lock.
 
 Contact

etc/domserver-static.php.in

@@ -12,7 +12,7 @@ define('ETCDIR',      '@domserver_etcdir@');
 define('WEBAPPDIR',   '@domserver_webappdir@');
 define('LIBDIR',      '@domserver_libdir@');
 define('SQLDIR',      '@domserver_sqldir@');
-define('LIBVENDORDIR','@domserver_libvendordir@');
+define('LIBVENDORDIR','@domserver_webappdir@/vendor');
 define('LOGDIR',      '@domserver_logdir@');
 define('RUNDIR',      '@domserver_rundir@');
 define('TMPDIR',      '@domserver_tmpdir@');

fix_location.sh

@@ -0,0 +1,8 @@
+for i in ./webapp/public/webfonts ./webapp/public/css/fontawesome-all.min.css ./webapp/public/css/bootstrap.min.css.map ./webapp/public/css/select2.min.css ./webapp/public/css/nv.d3.min.css ./webapp/public/css/bootstrap.min.css ./webapp/public/css/select2-bootstrap-5-theme.min.css ./webapp/public/css/dataTables.bootstrap5.min.css ./webapp/public/css/nv.d3.min.css.map ./webapp/public/js/jquery.min.js ./webapp/public/js/nv.d3.min.js ./webapp/public/js/bootstrap.bundle.min.js ./webapp/public/js/d3.min.js ./webapp/public/js/nv.d3.min.js.map ./webapp/public/js/FileSaver.min.js.map ./webapp/public/js/FileSaver.min.js ./webapp/public/js/dataTables.bootstrap5.min.js ./webapp/public/js/bootstrap.bundle.min.js.map ./webapp/public/js/select2.min.js ./webapp/public/js/dataTables.min.js ./webapp/public/flags
+do
+	old=$(readlink $i)
+	new=$(readlink $i | sed 's/lib\/vendor/webapp\/vendor/')
+	echo "Changing $i from $old to $new"
+	rm $i
+	ln -s $new $i
+done

lib/Makefile

@@ -12,21 +12,9 @@ $(OBJECTS): %$(OBJEXT): %.c %.h
 clean-l:
 	rm -f $(OBJECTS)
 
-# Change baseDir in composer autogenerated files
-define fix_composer_paths
-	for file in autoload_psr4.php autoload_classmap.php autoload_files.php autoload_namespaces.php ; do \
-		sed -i "s#^\$$baseDir = .*#\$$baseDir = dirname('$(domserver_webappdir)');#" $(1)/composer/$$file ; \
-	done
-	sed -i "s#__DIR__ \. '/\.\./\.\./\.\.' \. '/webapp#'$(domserver_webappdir)#" $(1)/composer/autoload_static.php
-endef
-
 install-domserver:
 	$(INSTALL_DATA) -t $(DESTDIR)$(domserver_libdir)    *.php
 	$(INSTALL_PROG) -t $(DESTDIR)$(domserver_libdir)    alert
-	for i in vendor/* ; do \
-		$(call install_tree,$(DESTDIR)$(domserver_libvendordir),$$i) ; \
-	done
-	$(call fix_composer_paths,$(DESTDIR)$(domserver_libvendordir))
 
 install-judgehost:
 	$(INSTALL_DATA) -t $(DESTDIR)$(judgehost_libdir)    *.php *.sh

phpstan.dist.neon

@@ -22,4 +22,4 @@ parameters:
             message: "#Method .* return type has no value type specified in iterable type array#"
             path: webapp/src/DataFixtures/Test
 includes:
-    - lib/vendor/phpstan/phpstan-doctrine/extension.neon
+    - webapp/vendor/phpstan/phpstan-doctrine/extension.neon

webapp/Makefile

@@ -9,7 +9,9 @@ include $(TOPDIR)/Makefile.global
 # Subdirectories to recurse into for REC_TARGETS
 SUBDIRS = config
 
-maintainer-conf: .env.local
+dist: composer-dependencies
+inplace-conf: composer-dependencies
+maintainer-conf: composer-dependencies-dev .env.local
 
 # Run Symfony in dev mode (for maintainer-mode):
 .env.local:
@@ -18,32 +20,62 @@ maintainer-conf: .env.local
 	@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
 	@echo "APP_ENV=dev" >> $@
 
+# Install PHP dependencies
+composer-dependencies:
+ifeq (, $(shell command -v composer 2> /dev/null))
+	$(error "'composer' command not found in $(PATH), install it via your package manager or https://getcomposer.org/download/")
+endif
+# We use --no-scripts here because at this point the autoload.php file is
+# not generated yet, which is needed to run the post-install scripts.
+	composer $(subst 1,-q,$(QUIET)) install --prefer-dist -o -a --no-scripts --no-plugins
+
+composer-dependencies-dev:
+	composer $(subst 1,-q,$(QUIET)) install --prefer-dist --no-scripts --no-plugins
+
+# Dump autoload dependencies (including plugins)
+# This is needed since symfony/runtime is a Composer plugin that runs while dumping
+# the autoload file
+composer-dump-autoload:
+	composer $(subst 1,-q,$(QUIET)) dump-autoload -o -a
+
+composer-dump-autoload-dev:
+	composer $(subst 1,-q,$(QUIET)) dump-autoload
+
 copy-bundle-assets:
 # We can not use bin/console here, as when using a fakeroot,
 # the include paths are broken. We just copy in the data we need
 	-rm -rf public/bundles/nelmioapidoc
 	mkdir -p public/bundles/nelmioapidoc
-	cp -R ../lib/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
+	cp -R ../webapp/vendor/nelmio/api-doc-bundle/Resources/public/* public/bundles/nelmioapidoc/
 
 clean-l:
 	-rm -rf public/bundles/nelmioapidoc
 
+# Change baseDir in composer autogenerated files
+define fix_composer_paths
+	for file in autoload_psr4.php autoload_classmap.php autoload_files.php autoload_namespaces.php ; do \
+		sed -i "s#^\$$baseDir = .*#\$$baseDir = dirname('$(domserver_webappdir)');#" $(1)/composer/$$file ; \
+	done
+	sed -i "s#__DIR__ \. '/\.\./\.\./\.\.' \. '/webapp#'$(domserver_webappdir)#" $(1)/composer/autoload_static.php
+endef
+
 install-domserver:
 # This must be done first to install with the rest.
 	$(MAKE) copy-bundle-assets
 	$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
-	for d in bin config migrations public resources src templates tests ; do \
+	for d in bin config migrations public resources src templates tests vendor; do \
 		$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \
 	done
+	$(call fix_composer_paths,$(DESTDIR)$(domserver_webappdir)/vendor)
 # 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) ; \
-		if echo $${target} | grep -q '\.\./\.\./lib/vendor' ; then \
+		if echo $${target} | grep -q '\.\./\.\./webapp/vendor' ; then \
 			rm $$link ; \
-			realtarget=$(domserver_libvendordir)$$(echo $${target} | sed 's!^.*\.\./\.\./lib/vendor!!') ; \
+			realtarget=$(domserver_webappdir)/vendor$$(echo $${target} | sed 's!^.*\.\./\.\./webapp/vendor!!') ; \
 			ln -s $$realtarget $$link ; \
 		fi \
 	done
@@ -56,4 +88,7 @@ maintainer-clean-l:
 		done ; \
 	done
 
+composer-clean:
+	composer auto-scripts
+
 .PHONY: copy-bundle-assets