From 0450aa63ab40404c256f1c2b8094d247cb3e23f6 Mon Sep 17 00:00:00 2001 From: Jean-Marie HENAFF Date: Fri, 4 Mar 2022 18:03:46 +0100 Subject: [PATCH] Use relative URLs for submodules Currently, committed URLs are HTTPS. This requires the use of a token and frequent use of credentials. SSH URLs on the other hand allows a more convenient workflow. We could convert all URLs to ssh instead, but then it becomes inconsistent if someone clones SolAR in HTTPS (e.g. for read only purpose), and don't want to configure SSH keys. The solution is to use relative path, as described here: https://www.damirscorner.com/blog/posts/20210423-ChangingUrlsOfGitSubmodules.html This way, the submodule will be fetched with whatever method used to clone SolAR. This may lead to ssh errors when 'git submodule foreach' is used with commands demanding a connection to the server (fetch, pull, ...). A solution is to increase 'MaxStartups' in sshd config as described here: https://docs.gitlab.com/ee/topics/git/troubleshooting_git.html#ssh_exchange_identification-error --- .gitmodules | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitmodules b/.gitmodules index 71371e1..5c61d0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,107 +1,107 @@ [submodule "core/SolARFramework"] path = core/SolARFramework - url = https://github.com/SolarFramework/SolARFramework + url = ../SolARFramework branch = . [submodule "core/SolARFrameworkGRPCRemote"] path = core/SolARFrameworkGRPCRemote - url = https://github.com/SolarFramework/SolARFrameworkGRPCRemote.git + url = ../SolARFrameworkGRPCRemote branch = . [submodule "modules/SolARModuleTools"] path = modules/SolARModuleTools - url = https://github.com/SolarFramework/SolARModuleTools + url = ../SolARModuleTools branch = . [submodule "samples/Sample-Slam"] path = samples/Sample-Slam - url = https://github.com/SolarFramework/Sample-Slam + url = ../Sample-Slam branch = . [submodule "modules/SolARModuleOpenCV"] path = modules/SolARModuleOpenCV - url = https://github.com/SolarFramework/SolARModuleOpenCV + url = ../SolARModuleOpenCV branch = . [submodule "modules/SolARModuleOpenGV"] path = modules/SolARModuleOpenGV - url = https://github.com/SolarFramework/SolARModuleOpenGV + url = ../SolARModuleOpenGV branch = . [submodule "modules/SolARModuleOpenGL"] path = modules/SolARModuleOpenGL - url = https://github.com/SolarFramework/SolARModuleOpenGL + url = ../SolARModuleOpenGL branch = . [submodule "modules/SolARModuleNonFreeOpenCV"] path = modules/SolARModuleNonFreeOpenCV - url = https://github.com/SolarFramework/SolARModuleNonFreeOpenCV + url = ../SolARModuleNonFreeOpenCV branch = . [submodule "modules/SolARModuleFBOW"] path = modules/SolARModuleFBOW - url = https://github.com/SolarFramework/SolARModuleFBOW + url = ../SolARModuleFBOW branch = . [submodule "modules/SolARModuleCeres"] path = modules/SolARModuleCeres - url = https://github.com/SolarFramework/SolARModuleCeres + url = ../SolARModuleCeres branch = . [submodule "modules/SolARModuleG2O"] path = modules/SolARModuleG2O - url = https://github.com/SolarFramework/SolARModuleG2O + url = ../SolARModuleG2O branch = . [submodule "samples/Sample-Triangulation"] path = samples/Sample-Triangulation - url = https://github.com/SolarFramework/Sample-Triangulation + url = ../Sample-Triangulation branch = . [submodule "core/SolARPipelineManager"] path = core/SolARPipelineManager - url = https://github.com/SolarFramework/SolARPipelineManager + url = ../SolARPipelineManager branch = . [submodule "plugin/unity/SolARUnityPlugin"] path = plugin/unity/SolARUnityPlugin - url = https://github.com/SolarFramework/SolARUnityPlugin + url = ../SolARUnityPlugin branch = develop [submodule "modules/SolARModuleRealSense"] path = modules/SolARModuleRealSense - url = https://github.com/SolarFramework/SolARModuleRealSense.git + url = ../SolARModuleRealSense branch = . [submodule "modules/SolARModulePCL"] path = modules/SolARModulePCL - url = https://github.com/SolarFramework/SolARModulePCL.git + url = ../SolARModulePCL branch = . [submodule "modules/SolARModulePopSift"] path = modules/SolARModulePopSift - url = https://github.com/SolarFramework/SolARModulePopSift + url = ../SolARModulePopSift branch = . [submodule "samples/Sample-DepthCamera"] path = samples/Sample-DepthCamera - url = https://github.com/SolarFramework/Sample-DepthCamera.git + url = ../Sample-DepthCamera branch = . [submodule "samples/Sample-FiducialMarker"] path = samples/Sample-FiducialMarker - url = https://github.com/SolarFramework/Sample-FiducialMarker + url = ../Sample-FiducialMarker branch = . [submodule "samples/Sample-Mapping"] path = samples/Sample-Mapping - url = https://github.com/SolarFramework/Sample-Mapping + url = ../Sample-Mapping branch = . [submodule "samples/Sample-NaturalImageMarker"] path = samples/Sample-NaturalImageMarker - url = https://github.com/SolarFramework/Sample-NaturalImageMarker + url = ../Sample-NaturalImageMarker branch = . [submodule "samples/Sample-Relocalization"] path = samples/Sample-Relocalization - url = https://github.com/SolarFramework/Sample-Relocalization.git + url = ../Sample-Relocalization branch = . [submodule "samples/Sample-MapUpdate"] path = samples/Sample-MapUpdate - url = https://github.com/SolarFramework/Sample-MapUpdate.git + url = ../Sample-MapUpdate branch = . [submodule "services/Service-MapUpdate"] path = services/Service-MapUpdate - url = https://github.com/SolarFramework/Service-MapUpdate.git + url = ../Service-MapUpdate [submodule "services/Service-Relocalization"] path = services/Service-Relocalization - url = https://github.com/SolarFramework/Service-Relocalization.git + url = ../Service-Relocalization [submodule "services/Service-Mapping"] path = services/Service-Mapping - url = https://github.com/SolarFramework/Service-Mapping.git + url = ../Service-Mapping [submodule "plugin/unity/SolARUnityClientHololens2Plugin"] path = plugin/unity/SolARUnityClientHololens2Plugin - url = https://github.com/SolarFramework/SolARUnityClientHololens2Plugin + url = ../SolARUnityClientHololens2Plugin [submodule "plugin/unity/SolARUnityClientHololens2"] path = plugin/unity/SolARUnityClientHololens2 - url = https://github.com/SolarFramework/SolARUnityClientHololens2 + url = ../SolARUnityClientHololens2