Implement -target (targets to build) and -exclude-target (exclude from build) options.

egorpugin · egorpugin · commit 2a9cf2c18f26 · 2020-01-01T02:42:16.000+03:00
diff --git a/src/sw/client/cli/client.cpp b/src/sw/client/cli/client.cpp
@@ -365,7 +365,6 @@ int main(int argc, char **argv)
 //static ::cl::list<path> build_arg0(::cl::Positional, ::cl::desc("Files or directoris to build"));
 
 // ide commands
-static ::cl::opt<String> target_build("target", ::cl::desc("Target to build")/*, ::cl::sub(subcommand_ide)*/);
 //static ::cl::opt<String> ide_rebuild("rebuild", ::cl::desc("Rebuild target"), ::cl::sub(subcommand_ide));
 //static ::cl::opt<String> ide_clean("clean", ::cl::desc("Clean target"), ::cl::sub(subcommand_ide));
 
diff --git a/src/sw/client/cli/command/build.cpp b/src/sw/client/cli/command/build.cpp
@@ -59,6 +59,9 @@ static cl::opt<bool> cl_show_output("show-output");
 static cl::opt<bool> cl_write_output_to_file("write-output-to-file");
 //static cl::opt<bool> print_graph("print-graph", cl::desc("Print file with build graph"));
 
+static ::cl::list<String> targets_to_build("target", ::cl::desc("Targets to build"));
+static ::cl::list<String> targets_to_ignore("exclude-target", ::cl::desc("Targets to ignore"));
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // build configs
@@ -654,6 +657,10 @@ std::unique_ptr<sw::SwBuild> createBuild(sw::SwContext &swctx)
         bs["write_output_to_file"] = "true";
     if (!time_limit.empty())
         bs["time_limit"] = time_limit;
+    for (auto &t : targets_to_build)
+        bs["target-to-build"].push_back(t);
+    for (auto &t : targets_to_ignore)
+        bs["target-to-exclude"].push_back(t);
     b->setSettings(bs);
 
     return b;
diff --git a/src/sw/core/build.cpp b/src/sw/core/build.cpp
@@ -461,13 +461,38 @@ Commands SwBuild::getCommands() const
     if (targets_to_build.empty())
         throw SW_RUNTIME_ERROR("no targets were selected for building");
 
-    auto ttb = targets_to_build;
+    StringSet in_ttb;
+    StringSet in_ttb_exclude;
+    for (auto &t : build_settings["target-to-build"].getArray())
+        in_ttb.insert(t);
+    for (auto &t : build_settings["target-to-exclude"].getArray())
+    {
+        if (in_ttb.find(t) != in_ttb.end())
+            throw SW_RUNTIME_ERROR("Target " + t + " specified both in include and exclude lists");
+        in_ttb_exclude.insert(t);
+    }
+
+    decltype(targets_to_build) ttb;
 
     // detect all targets to build
     // some static builds won't build deps, because there's no dependent link files
     // (e.g. build static png, zlib won't be built)
     for (auto &[p, tgts] : targets_to_build)
     {
+        if (!in_ttb.empty())
+        {
+            auto i = in_ttb.find(p.toString());
+            if (i == in_ttb.end())
+                continue;
+            in_ttb.erase(i);
+        }
+        if (in_ttb_exclude.find(p.toString()) != in_ttb_exclude.end())
+        {
+            continue;
+        }
+
+        ttb[p] = tgts;
+
         // one target may be loaded twice
         // we take only the latest, because it is has correct set of command deps per requested settings
         std::map<TargetSettings, ITarget*> latest_targets;
@@ -518,6 +543,15 @@ Commands SwBuild::getCommands() const
         }
     }
 
+    if (!in_ttb.empty())
+    {
+        String s;
+        for (auto &t : in_ttb)
+            s += t + ", ";
+        s.resize(s.size() - 2);
+        throw SW_RUNTIME_ERROR("Cannot make targets: " + s + ": no such targets");
+    }
+
     //
     auto cl_show_output = build_settings["show_output"] == "true";
     auto cl_write_output_to_file = build_settings["write_output_to_file"] == "true";
