Reduce number of deps in cl generator. Add ignore deps' generated commands flag.

egorpugin · egorpugin · commit 54fd4f655384 · 2019-01-30T23:54:02.000+03:00
diff --git a/cppan.yml b/cppan.yml
@@ -129,7 +129,7 @@ projects:
         root_directory: src/tools
         files: cl_generator.cpp
         dependencies:
-            - name: pvt.egorpugin.primitives.sw.main
+            - name: pvt.egorpugin.primitives.main
               version: master
               local: primitives.sw.main
             - name: pvt.egorpugin.primitives.context
diff --git a/src/driver/cpp/command.cpp b/src/driver/cpp/command.cpp
@@ -22,17 +22,18 @@ DECLARE_STATIC_LOGGER(logger, "cpp.command");
 namespace sw::driver::cpp
 {
 
-Command::Command()
+namespace detail
 {
-}
 
 Command::Command(::sw::FileStorage &fs)
     : Base::Command(fs)
 {
+}
 
 }
 
-Command::~Command()
+Command::Command(::sw::FileStorage &fs)
+    : Base::Command(fs)
 {
 }
 
diff --git a/src/driver/cpp/command.h b/src/driver/cpp/command.h
@@ -280,17 +280,32 @@ inline tag_env env(const String &k, const String &v)
 namespace driver::cpp
 {
 
+namespace detail
+{
+
 struct SW_DRIVER_CPP_API Command : ::sw::builder::Command
 {
     using Base = ::sw::builder::Command;
+
+    bool ignore_deps_generated_commands = false;
+
+    Command() = default;
+    Command(::sw::FileStorage &fs);
+};
+
+}
+
+struct SW_DRIVER_CPP_API Command : detail::Command
+{
+    using Base = detail::Command;
     using LazyCallback = std::function<String(void)>;
     using LazyAction = std::function<void(void)>;
 
     bool program_set = false;
 
-    Command();
+    Command() = default;
     Command(::sw::FileStorage &fs);
-    virtual ~Command();
+    virtual ~Command() = default;
 
     virtual std::shared_ptr<Command> clone() const;
     path getProgram() const override;
@@ -310,7 +325,7 @@ struct SW_DRIVER_CPP_API Command : ::sw::builder::Command
     bool dependency_set = false;
 };
 
-struct SW_DRIVER_CPP_API ExecuteBuiltinCommand : builder::Command
+struct SW_DRIVER_CPP_API ExecuteBuiltinCommand : detail::Command
 {
     using F = std::function<void(void)>;
 
diff --git a/src/driver/cpp/solution.cpp b/src/driver/cpp/solution.cpp
@@ -1407,7 +1407,7 @@ SharedLibraryTarget &Build::createTarget(const Files &files)
 static void addDeps(NativeExecutedTarget &lib, Solution &solution)
 {
     lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.version");
-    lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.filesystem");
+    //lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.filesystem");
 
     auto &drv = solution.getTarget<NativeTarget>("org.sw.sw.client.driver.cpp");
     auto d = lib + drv;
diff --git a/src/driver/cpp/target/native.cpp b/src/driver/cpp/target/native.cpp
@@ -862,11 +862,6 @@ Commands NativeExecutedTarget::getCommands() const
     }
     cmds.insert(generated.begin(), generated.end());
 
-    //LOG_DEBUG(logger, "Building target: " + pkg.ppath.toString());
-    //move this somewhere
-
-    //DEBUG_BREAK_IF_STRING_HAS(pkg.ppath.toString(), "self_builder");
-
     // add install commands
     for (auto &[p, f] : *this)
     {
@@ -921,10 +916,15 @@ Commands NativeExecutedTarget::getCommands() const
         // add dependencies on generated commands from dependent targets
         for (auto &l : get_tgts())
         {
-            for (auto &c2 : ((NativeExecutedTarget*)l)->getGeneratedCommands())
+            if (auto nt = l->as<NativeExecutedTarget>(); nt)
             {
+                auto cmds2 = nt->getGeneratedCommands();
                 for (auto &c : cmds)
-                    c->dependencies.insert(c2);
+                {
+                    if (auto c2 = c->as<driver::cpp::detail::Command>(); c2 && c2->ignore_deps_generated_commands)
+                        continue;
+                    c->dependencies.insert(cmds2.begin(), cmds2.end());
+                }
             }
         }
 
diff --git a/src/tools/cl_generator.cpp b/src/tools/cl_generator.cpp
@@ -1,7 +1,6 @@
-#include <primitives/context.h>
+#include <primitives/context.h>
+#include <primitives/main.h>
 #include <primitives/yaml.h>
-#include <primitives/sw/main.h>
-#include <primitives/sw/settings.h>
 
 template <class ... Args>
 void both(primitives::CppContext &hctx, primitives::CppContext &cctx, Args && ... args)
@@ -176,14 +175,18 @@ void read_flags(const yaml &root, Flags &flags)
 
 int main(int argc, char **argv)
 {
-    cl::opt<path> in(cl::Positional, cl::Required);
-    cl::opt<path> out1(cl::Positional, cl::Required);
-    cl::opt<path> out2(cl::Positional, cl::Required);
+    if (argc != 4)
+    {
+        printf("usage: in.yml out.h out.cpp\n");
+        return 1;
+    }
 
-    cl::ParseCommandLineOptions(argc, argv);
+    path in = argv[1];
+    path out1 = argv[2];
+    path out2 = argv[3];
 
-    auto h = out1.getValue().extension() == ".h" ? out1.getValue() : out2.getValue();
-    auto cpp = out1.getValue().extension() == ".cpp" ? out1.getValue() : out2.getValue();
+    auto h = out1.extension() == ".h" ? out1 : out2;
+    auto cpp = out1.extension() == ".cpp" ? out1 : out2;
 
     auto root = YAML::Load(read_file(in));
 
diff --git a/sw.cpp b/sw.cpp
@@ -102,7 +102,7 @@ void build(Solution &s)
     cl_generator +=
         "pub.egorpugin.primitives.context-master"_dep,
         "pub.egorpugin.primitives.yaml-master"_dep,
-        "pub.egorpugin.primitives.sw.main-master"_dep;
+        "pub.egorpugin.primitives.main-master"_dep;
 
     auto &builder = p.addTarget<LibraryTarget>("builder");
     builder.ApiName = "SW_BUILDER_API";
@@ -156,6 +156,7 @@ void build(Solution &s)
             << cmd::out("options_cl.generated.h")
             << cmd::out("options_cl.generated.cpp", cmd::Skip)
             ;
+        c.c->ignore_deps_generated_commands = true;
     }
     if (!s.Variables["SW_SELF_BUILD"])
     {

Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,18 @@ DECLARE_STATIC_LOGGER(logger, "cpp.command");`
`22`	`22`	`namespace sw::driver::cpp`
`23`	`23`	`{`
`24`	`24`
`25`		`-Command::Command()`
	`25`	`+namespace detail`
`26`	`26`	`{`
`27`		`-}`
`28`	`27`
`29`	`28`	`Command::Command(::sw::FileStorage &fs)`
`30`	`29`	`: Base::Command(fs)`
`31`	`30`	`{`
	`31`	`+}`
`32`	`32`
`33`	`33`	`}`
`34`	`34`
`35`		`-Command::~Command()`
	`35`	`+Command::Command(::sw::FileStorage &fs)`
	`36`	`+ : Base::Command(fs)`
`36`	`37`	`{`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -1407,7 +1407,7 @@ SharedLibraryTarget &Build::createTarget(const Files &files)`
`1407`	`1407`	`static void addDeps(NativeExecutedTarget &lib, Solution &solution)`
`1408`	`1408`	`{`
`1409`	`1409`	`lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.version");`
`1410`		`- lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.filesystem");`
	`1410`	`+ //lib += solution.getTarget<NativeTarget>("pub.egorpugin.primitives.filesystem");`
`1411`	`1411`
`1412`	`1412`	`auto &drv = solution.getTarget<NativeTarget>("org.sw.sw.client.driver.cpp");`
`1413`	`1413`	`auto d = lib + drv;`
Original file line number	Diff line number	Diff line change
`@@ -862,11 +862,6 @@ Commands NativeExecutedTarget::getCommands() const`
`862`	`862`	`}`
`863`	`863`	`cmds.insert(generated.begin(), generated.end());`
`864`	`864`
`865`		`- //LOG_DEBUG(logger, "Building target: " + pkg.ppath.toString());`
`866`		`- //move this somewhere`
`867`		`-`
`868`		`- //DEBUG_BREAK_IF_STRING_HAS(pkg.ppath.toString(), "self_builder");`
`869`		`-`
`870`	`865`	`// add install commands`
`871`	`866`	`for (auto &[p, f] : *this)`
`872`	`867`	`{`
`@@ -921,10 +916,15 @@ Commands NativeExecutedTarget::getCommands() const`
`921`	`916`	`// add dependencies on generated commands from dependent targets`
`922`	`917`	`for (auto &l : get_tgts())`
`923`	`918`	`{`
`924`		`- for (auto &c2 : ((NativeExecutedTarget*)l)->getGeneratedCommands())`
	`919`	`+ if (auto nt = l->as<NativeExecutedTarget>(); nt)`
`925`	`920`	`{`
	`921`	`+ auto cmds2 = nt->getGeneratedCommands();`
`926`	`922`	`for (auto &c : cmds)`
`927`		`- c->dependencies.insert(c2);`
	`923`	`+ {`
	`924`	`+ if (auto c2 = c->as<driver::cpp::detail::Command>(); c2 && c2->ignore_deps_generated_commands)`
	`925`	`+ continue;`
	`926`	`+ c->dependencies.insert(cmds2.begin(), cmds2.end());`
	`927`	`+ }`
`928`	`928`	`}`
`929`	`929`	`}`
`930`	`930`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void build(Solution &s)`
`102`	`102`	`cl_generator +=`
`103`	`103`	`"pub.egorpugin.primitives.context-master"_dep,`
`104`	`104`	`"pub.egorpugin.primitives.yaml-master"_dep,`
`105`		`- "pub.egorpugin.primitives.sw.main-master"_dep;`
	`105`	`+ "pub.egorpugin.primitives.main-master"_dep;`
`106`	`106`
`107`	`107`	`auto &builder = p.addTarget<LibraryTarget>("builder");`
`108`	`108`	`builder.ApiName = "SW_BUILDER_API";`
`@@ -156,6 +156,7 @@ void build(Solution &s)`
`156`	`156`	`<< cmd::out("options_cl.generated.h")`
`157`	`157`	`<< cmd::out("options_cl.generated.cpp", cmd::Skip)`
`158`	`158`	`;`
	`159`	`+ c.c->ignore_deps_generated_commands = true;`
`159`	`160`	`}`
`160`	`161`	`if (!s.Variables["SW_SELF_BUILD"])`
`161`	`162`	`{`