Remove cppan driver.

egorpugin · egorpugin · commit 8ea6eaa74576 · 2018-12-01T14:32:43.000+03:00
diff --git a/cppan.yml b/cppan.yml
@@ -127,7 +127,6 @@ projects:
         dependencies:
             - builder
             - driver.cpp
-            - driver.cppan
             - pvt.cppan.demo.giovannidicanio.winreg: master
             - name: pvt.egorpugin.primitives.sw.main
               version: master
@@ -206,21 +205,6 @@ projects:
         post_target: |
             cppan_flex_bison_internal(src/driver/cpp/bazel/lexer.ll PARSERS src/driver/cpp/bazel/grammar.yy)
 
-    driver.cppan:
-        type: library
-        #static_only: true
-        api_name: SW_DRIVER_CPPAN_API
-        #export_if_static: true
-
-        files:
-            - include/sw/driver/cppan/.*
-            - src/driver/cppan/.*
-
-        include_directories:
-            - include
-
-        dependencies:
-            - builder
 
     builder:
         type: library
diff --git a/include/sw/driver/cppan/driver.h b/include/sw/driver/cppan/driver.h
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -17,7 +17,6 @@
 #include <sw/builder/build.h>
 #include <sw/builder/driver.h>
 #include <sw/driver/cpp/driver.h>
-#include <sw/driver/cppan/driver.h>
 #include <jumppad.h>
 
 //#include <args.hxx>
@@ -52,7 +51,6 @@ bool bConsoleMode = true;
 bool bUseSystemPause = false;
 
 namespace sw::driver::cpp { SW_REGISTER_PACKAGE_DRIVER(CppDriver); }
-namespace sw::driver::cppan { SW_REGISTER_PACKAGE_DRIVER(CppanDriver); }
 
 /*
 // check args here to see if we want gui or not!
@@ -553,6 +551,7 @@ SUBCOMMAND_DECL(test)
 extern ::cl::opt<bool> dry_run;
 SUBCOMMAND_DECL(update)
 {
+    getPackageStore() = sw::PackageStore();
     dry_run = true;
     build_arg = build_arg_update.getValue();
     cli_build();
diff --git a/src/driver/cppan/driver.cpp b/src/driver/cppan/driver.cpp
diff --git a/src/manager/resolver.cpp b/src/manager/resolver.cpp
@@ -262,17 +262,35 @@ void Resolver::add_dep(Dependencies &dd, const PackageId &d)
 
 void Resolver::resolve(const UnresolvedPackages &deps, std::function<void()> resolve_action)
 {
-    if (!resolve_action)
-        throw std::logic_error("Empty resolve action!");
-
     if (getPackageStore().use_lock_file)
     {
+        UnresolvedPackages deps2;
         for (auto &d : deps)
-            add_dep(download_dependencies_, getPackageStore().resolved_packages[d]);
+        {
+            auto &up = getPackageStore().resolved_packages;
+            auto i = up.find(d);
+            if (i == up.end())
+            {
+                deps2.insert(d);
+                LOG_INFO(logger, "new dependency detected: " + d.toString());
+                //throw std::runtime_error("unresolved package from lock file: " + d.toString());
+            }
+            add_dep(download_dependencies_, i->second);
+        }
+        if (!deps2.empty())
+            resolve1(deps2, resolve_action);
         resolve_action();
         return;
     }
 
+    resolve1(deps, resolve_action);
+}
+
+void Resolver::resolve1(const UnresolvedPackages &deps, std::function<void()> resolve_action)
+{
+    if (!resolve_action)
+        throw std::logic_error("Empty resolve action!");
+
     // ref to not invalidate all ptrs
     auto &us = Settings::get_user_settings();
     auto cr = us.remotes.begin();
@@ -288,7 +306,8 @@ void Resolver::resolve(const UnresolvedPackages &deps, std::function<void()> res
             {
                 if (us.remotes.size() > 1)
                     LOG_INFO(logger, "Trying " + current_remote->name + " remote");
-                download_dependencies_ = getDependenciesFromRemote(deps, current_remote);
+                auto dd = getDependenciesFromRemote(deps, current_remote);
+                download_dependencies_.insert(dd.begin(), dd.end());
             }
             catch (const std::exception &e)
             {
@@ -315,7 +334,8 @@ void Resolver::resolve(const UnresolvedPackages &deps, std::function<void()> res
             {
                 try
                 {
-                    download_dependencies_ = getDependenciesFromDb(deps, current_remote);
+                    auto dd = getDependenciesFromDb(deps, current_remote);
+                    download_dependencies_.insert(dd.begin(), dd.end());
                 }
                 catch (std::exception &e)
                 {
diff --git a/src/manager/resolver.h b/src/manager/resolver.h
@@ -62,6 +62,7 @@ class SW_MANAGER_API Resolver
     void download_and_unpack();
 
     void resolve(const UnresolvedPackages &deps, std::function<void()> resolve_action);
+    void resolve1(const UnresolvedPackages &deps, std::function<void()> resolve_action);
     void download(const ExtendedPackageData &d, const path &fn);
     static void add_dep(Dependencies &dd, const PackageId &d);
 };
diff --git a/sw.cpp b/sw.cpp
@@ -97,14 +97,6 @@ void build(Solution &s)
             c->BigObj = true;
 #endif
 
-    auto &cppan_driver = p.addTarget<LibraryTarget>("driver.cppan");
-    cppan_driver.ApiName = "SW_DRIVER_CPPAN_API";
-    cppan_driver.ExportIfStatic = true;
-    cppan_driver.CPPVersion = CPPLanguageStandard::CPP17;
-    cppan_driver.Public += builder;
-    cppan_driver += "src/driver/cppan/.*"_rr, "include/sw/driver/cppan/.*"_rr;
-    cppan_driver.Public += "include"_idir, "src/driver/cppan"_idir;
-
     auto &tools = p.addDirectory("tools");
     auto &self_builder = tools.addTarget<ExecutableTarget>("self_builder");
     self_builder.PackageDefinitions = true;
@@ -134,7 +126,7 @@ void build(Solution &s)
     client += "src/client/.*"_rr;
     client += "src/client"_idir;
     client.CPPVersion = CPPLanguageStandard::CPP17;
-    client += cpp_driver, cppan_driver,
+    client += cpp_driver,
         "pub.egorpugin.primitives.sw.main-master"_dep,
         "org.sw.demo.giovannidicanio.winreg-master"_dep;
 
