Improve single package building.

egorpugin · egorpugin · commit ccfd93f8fc8d · 2017-03-26T15:43:54.000+03:00
diff --git a/src/client/build.cpp b/src/client/build.cpp
@@ -222,6 +222,34 @@ int build_packages(const String &name, const std::set<Package> &pkgs, const path
 int build_package(const String &target_name, const path &settings_fn, const String &config)
 {
     Settings::get_local_settings().copy_all_libraries_to_output = true;
-    auto p = extractFromString(target_name);
+
+    String target = target_name;
+    bool added_suffix = false;
+    if (target.rfind('-') == target.npos)
+    {
+        target += "-*"; // add the latest version
+        added_suffix = true;
+    }
+    auto p = extractFromString(target);
+    try
+    {
+        p = resolve_dependencies({ { p.ppath.toString(), p } })[p];
+    }
+    catch (const std::exception &)
+    {
+        if (!added_suffix)
+            throw;
+
+        target = target_name + "-master"; // add the master version
+        p = extractFromString(target);
+        p = resolve_dependencies({ { p.ppath.toString(), p } })[p];
+
+        // TODO: if no master version, try to get first branch from local db
+        // (another try ... catch)
+        //target = target_name + "-master"; // add the master version
+        //p = extractFromString(target);
+        //resolved_deps = resolve_dependencies({ { p.ppath.toString(), p } });
+
+    }
     return build_packages(p.ppath.back(), { p }, settings_fn, config);
 }
diff --git a/src/common/resolver.cpp b/src/common/resolver.cpp
@@ -47,10 +47,11 @@ Resolver::Dependencies getDependenciesFromRemote(const Packages &deps, const Rem
 Resolver::Dependencies getDependenciesFromDb(const Packages &deps, const Remote *current_remote);
 Resolver::Dependencies prepareIdDependencies(const IdDependencies &id_deps, const Remote *current_remote);
 
-void resolve_dependencies(const Packages &deps)
+std::map<Package, Package> resolve_dependencies(const Packages &deps)
 {
     Resolver r;
     r.resolve_dependencies(deps);
+    return r.resolved_packages;
 }
 
 void resolve_and_download(const Package &p, const path &fn)
@@ -90,11 +91,13 @@ void Resolver::resolve_dependencies(const Packages &dependencies)
         {
             if (d.second.ppath == dl.second.ppath && dl.second.flags[pfDirectDependency])
             {
-                rd.resolved_packages[d.second] = dl.second;
+                resolved_packages[d.second] = dl.second;
                 break;
             }
         }
     }
+    // push to global
+    rd.resolved_packages.insert(resolved_packages.begin(), resolved_packages.end());
 
     // other related stuff
     read_configs();
diff --git a/src/common/resolver.h b/src/common/resolver.h
@@ -25,6 +25,8 @@ class Resolver
     using Dependencies = DownloadDependency::Dependencies;
 
 public:
+    std::map<Package, Package> resolved_packages;
+
     void resolve_dependencies(const Packages &deps);
     void resolve_and_download(const Package &p, const path &fn);
     void assign_dependencies(const Package &p, const Packages &deps); // why such name?
@@ -45,4 +47,4 @@ class Resolver
 };
 
 void resolve_and_download(const Package &p, const path &fn);
-void resolve_dependencies(const Packages &deps);
+std::map<Package, Package> resolve_dependencies(const Packages &deps);

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,11 @@ Resolver::Dependencies getDependenciesFromRemote(const Packages &deps, const Rem`
`47`	`47`	`Resolver::Dependencies getDependenciesFromDb(const Packages &deps, const Remote *current_remote);`
`48`	`48`	`Resolver::Dependencies prepareIdDependencies(const IdDependencies &id_deps, const Remote *current_remote);`
`49`	`49`
`50`		`-void resolve_dependencies(const Packages &deps)`
	`50`	`+std::map<Package, Package> resolve_dependencies(const Packages &deps)`
`51`	`51`	`{`
`52`	`52`	`Resolver r;`
`53`	`53`	`r.resolve_dependencies(deps);`
	`54`	`+ return r.resolved_packages;`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`void resolve_and_download(const Package &p, const path &fn)`
`@@ -90,11 +91,13 @@ void Resolver::resolve_dependencies(const Packages &dependencies)`
`90`	`91`	`{`
`91`	`92`	`if (d.second.ppath == dl.second.ppath && dl.second.flags[pfDirectDependency])`
`92`	`93`	`{`
`93`		`- rd.resolved_packages[d.second] = dl.second;`
	`94`	`+ resolved_packages[d.second] = dl.second;`
`94`	`95`	`break;`
`95`	`96`	`}`
`96`	`97`	`}`
`97`	`98`	`}`
	`99`	`+ // push to global`
	`100`	`+ rd.resolved_packages.insert(resolved_packages.begin(), resolved_packages.end());`
`98`	`101`
`99`	`102`	`// other related stuff`
`100`	`103`	`read_configs();`