Move paths.mk references

Author: vmcj

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@');

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

paths.mk.in

@@ -86,7 +86,6 @@ domserver_etcdir          = @domserver_etcdir@
 domserver_webappdir       = @domserver_webappdir@
 domserver_sqldir          = @domserver_sqldir@
 domserver_libdir          = @domserver_libdir@
-domserver_libvendordir    = @domserver_webappdir@/vendor
 domserver_logdir          = @domserver_logdir@
 domserver_rundir          = @domserver_rundir@
 domserver_tmpdir          = @domserver_tmpdir@
@@ -112,8 +111,7 @@ systemd_unitdir           = @systemd_unitdir@
 # The tmpdir's are not in these lists, since they would otherwise get
 # their permissions overwritten in FHS install mode.
 domserver_dirs = $(domserver_bindir) $(domserver_etcdir) \
-                 $(domserver_libdir) $(domserver_libvendordir) \
-                 $(domserver_logdir) $(domserver_rundir) \
+                 $(domserver_libdir) $(domserver_logdir) $(domserver_rundir) \
                  $(addprefix $(domserver_webappdir)/public/images/,affiliations countries teams) \
                  $(domserver_exampleprobdir) $(domserver_databasedumpdir)
 
@@ -138,7 +136,6 @@ define substconfigvars
 	-e 's,@domserver_webappdir[@],@domserver_webappdir@,g' \
 	-e 's,@domserver_sqldir[@],@domserver_sqldir@,g' \
 	-e 's,@domserver_libdir[@],@domserver_libdir@,g' \
-	-e 's,@domserver_libvendordir[@],@domserver_libvendordir@,g' \
 	-e 's,@domserver_logdir[@],@domserver_logdir@,g' \
 	-e 's,@domserver_rundir[@],@domserver_rundir@,g' \
 	-e 's,@domserver_tmpdir[@],@domserver_tmpdir@,g' \

webapp/Makefile

@@ -19,13 +19,27 @@ copy-bundle-assets:
 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; do \
 		$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \
 	done
+	for i in vendor/* ; do \
+		$(call install_tree,$(DESTDIR)$(domserver_webappdir)vendor,$$i) ; \
+	done
+	echo $(DESTDIR)$(domserver_webappdir)vendor
+	echo "Hook"
+	$(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
@@ -34,7 +48,7 @@ install-domserver:
 		target=$$(readlink $$link) ; \
 		if echo $${target} | grep -q '\.\./\.\./lib/vendor' ; then \
 			rm $$link ; \
-			realtarget=$(domserver_libvendordir)$$(echo $${target} | sed 's!^.*\.\./\.\./lib/vendor!!') ; \
+			realtarget=$(domserver_webappdir)vendor$$(echo $${target} | sed 's!^.*\.\./\.\./lib/vendor!!') ; \
 			ln -s $$realtarget $$link ; \
 		fi \
 	done

webapp/config/static.yaml.in

@@ -7,7 +7,7 @@ parameters:
     domjudge.webappdir: @domserver_webappdir@
     domjudge.libdir: @domserver_libdir@
     domjudge.sqldir: @domserver_sqldir@
-    domjudge.libvendordir: @domserver_libvendordir@
+    domjudge.libvendordir: @domserver_webappdir@/vendor
     domjudge.logdir: @domserver_logdir@
     domjudge.rundir: @domserver_rundir@
     domjudge.tmpdir: @domserver_tmpdir@