Allow loading the dependencies from a checkout of the Dependencies repository instead.

Author: dlemstra

src/Config.cpp

@@ -124,6 +124,12 @@ const Config Config::copyInfo(const Config &config) const
   return(newConfig);
 }
 
+void Config::correctDirectory()
+{
+  if (startsWith(_directory,L"Dependencies\\"))
+    _directory=L"Dependencies\\" + _directory;
+}
+
 Config Config::load(const wstring name,const wstring &directory,const wstring &configFile)
 {
   Config config(name,directory);

src/Config.h

@@ -75,6 +75,8 @@ class Config
 
   const Config copyInfo(const Config &config) const;
 
+  void correctDirectory();
+
   static Config load(const wstring name,const wstring &directory,const wstring &configFile);
 
   void rename(const wstring& name);

src/Configs.cpp

@@ -36,14 +36,18 @@ void Configs::addConfig(Config &config,const Options &options,vector<Config> &co
   configs.push_back(config);
 }
 
+void Configs::correctDirectories(vector<Config> &configs)
+{
+  for(auto& config : configs)
+    config.correctDirectory();
+}
+
 vector<Config> Configs::load(const Options &options)
 {
   vector<Config>
     configs;
 
-  loadDirectory(options,L"Dependencies",configs);
-  loadDirectory(options,L"OptionalDependencies",configs);
-
+  loadDependencies(options,configs);
   loadImageMagick(options,configs);
   removeInvalidReferences(options,configs);
   validate(options,configs);
@@ -92,6 +96,24 @@ void Configs::loadConfig(const Options &options,const wstring &name,const wstrin
   addConfig(config,options,configs);
 }
 
+void Configs::loadDependencies(const Options &options,vector<Config> &configs)
+{
+  if (!filesystem::exists(options.rootDirectory + L"Dependencies"))
+    return;
+
+  if (filesystem::exists(options.rootDirectory + L"Dependencies\\Dependencies"))
+  {
+    loadDirectory(options,L"Dependencies\\Dependencies",configs);
+    loadDirectory(options,L"Dependencies\\OptionalDependencies",configs);
+    correctDirectories(configs);
+  }
+  else
+  {
+    loadDirectory(options,L"Dependencies",configs);
+    loadDirectory(options,L"OptionalDependencies",configs);
+  }
+}
+
 void Configs::loadDirectory(const Options &options,const wstring directory,vector<Config> &configs) 
 {
   const auto fullProjectDirectory=options.rootDirectory + L"\\" + directory;

src/Configs.h

@@ -31,12 +31,16 @@ class Configs
 private:
   static void addConfig(Config &config,const Options &options,vector<Config> &configs);
 
+  static void correctDirectories(vector<Config> &configs);
+
   static void loadCoders(const Options &options,vector<Config> &configs);
 
   static Config loadConfig(const Options &options,const wstring &name,const wstring &directory);
 
   static void loadConfig(const Options &options,const wstring &name,const wstring &directory,vector<Config> &configs);
 
+  static void loadDependencies(const Options &options,vector<Config> &configs);
+
   static void loadDirectory(const Options &options,const wstring directory,vector<Config> &configs);
 
   static void loadImageMagick(const Options &options,vector<Config> &configs);