[gen][vs] Do not emit BUILD_DEPENDENCIES target when no deps are needed.

egorpugin · egorpugin · commit 8c7540c981d1 · 2020-01-01T04:35:29.000+03:00
diff --git a/src/sw/client/cli/generator/vs/vs.cpp b/src/sw/client/cli/generator/vs/vs.cpp
@@ -268,8 +268,10 @@ void VSGenerator::generate(const SwBuild &b)
     dl(ts, tables1);
     dl(ts.substr(0, ts.size() - 1), tables2);
 
+    auto &ttb = b.getTargetsToBuild();
+
     // get settings from targets to use settings equality later
-    for (auto &[pkg, tgts] : b.getTargetsToBuild())
+    for (auto &[pkg, tgts] : ttb)
     {
         decltype(s.settings) s2;
         for (auto &st : s.settings)
@@ -400,7 +402,7 @@ void VSGenerator::generate(const SwBuild &b)
         }
     }
 
-    for (auto &[pkg, tgts] : b.getTargetsToBuild())
+    for (auto &[pkg, tgts] : ttb)
     {
         // add project with settings
         for (auto &tgt : tgts)
@@ -527,7 +529,7 @@ void VSGenerator::generate(const SwBuild &b)
             d.build_rules.erase(d.main_command);
         }
     }
-    for (auto &[pkg, tgts] : b.getTargetsToBuild())
+    for (auto &[pkg, tgts] : ttb)
     {
         for (auto &tgt : tgts)
         {
@@ -542,7 +544,7 @@ void VSGenerator::generate(const SwBuild &b)
                     continue;
 
                 // filter out predefined & deps targets
-                auto &pd = b.getTargetsToBuild();
+                auto &pd = ttb;
                 if (pd.find(d->getUnresolvedPackage().ppath) == pd.end(d->getUnresolvedPackage().ppath))
                 {
                     data.dependencies.insert(&d->getTarget());
@@ -642,6 +644,8 @@ void VSGenerator::generate(const SwBuild &b)
         // create datas
         for (auto &st : s.settings)
             p.getData(st).type = p.type;
+
+        bool has_deps = false;
         for (auto &st : s.settings)
         {
             auto &d = p.getData(st);
@@ -669,6 +673,9 @@ void VSGenerator::generate(const SwBuild &b)
                     p1.dependencies.insert(&p); // add dependency for project
                 }
             }
+            if (deps.empty())
+                continue;
+            has_deps = true;
 
             String deps_str;
             for (auto &[d,s] : deps)
@@ -701,6 +708,9 @@ void VSGenerator::generate(const SwBuild &b)
             be.command = "sw @" + normalize_path(rsp);
             d.pre_build_event = be;
         }
+
+        if (!has_deps)
+            s.projects.erase(build_dependencies_name);
     }
 
     // add path dirs
@@ -721,7 +731,7 @@ void VSGenerator::generate(const SwBuild &b)
         }
 
         // set project dirs
-        for (auto &[pkg, tgts] : b.getTargetsToBuild())
+        for (auto &[pkg, tgts] : ttb)
         {
             for (auto &tgt : tgts)
             {

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,10 @@ void VSGenerator::generate(const SwBuild &b)`
`268`	`268`	`dl(ts, tables1);`
`269`	`269`	`dl(ts.substr(0, ts.size() - 1), tables2);`
`270`	`270`
	`271`	`+ auto &ttb = b.getTargetsToBuild();`
	`272`	`+`
`271`	`273`	`// get settings from targets to use settings equality later`
`272`		`- for (auto &[pkg, tgts] : b.getTargetsToBuild())`
	`274`	`+ for (auto &[pkg, tgts] : ttb)`
`273`	`275`	`{`
`274`	`276`	`decltype(s.settings) s2;`
`275`	`277`	`for (auto &st : s.settings)`
`@@ -400,7 +402,7 @@ void VSGenerator::generate(const SwBuild &b)`
`400`	`402`	`}`
`401`	`403`	`}`
`402`	`404`
`403`		`- for (auto &[pkg, tgts] : b.getTargetsToBuild())`
	`405`	`+ for (auto &[pkg, tgts] : ttb)`
`404`	`406`	`{`
`405`	`407`	`// add project with settings`
`406`	`408`	`for (auto &tgt : tgts)`
`@@ -527,7 +529,7 @@ void VSGenerator::generate(const SwBuild &b)`
`527`	`529`	`d.build_rules.erase(d.main_command);`
`528`	`530`	`}`
`529`	`531`	`}`
`530`		`- for (auto &[pkg, tgts] : b.getTargetsToBuild())`
	`532`	`+ for (auto &[pkg, tgts] : ttb)`
`531`	`533`	`{`
`532`	`534`	`for (auto &tgt : tgts)`
`533`	`535`	`{`
`@@ -542,7 +544,7 @@ void VSGenerator::generate(const SwBuild &b)`
`542`	`544`	`continue;`
`543`	`545`
`544`	`546`	`// filter out predefined & deps targets`
`545`		`- auto &pd = b.getTargetsToBuild();`
	`547`	`+ auto &pd = ttb;`
`546`	`548`	`if (pd.find(d->getUnresolvedPackage().ppath) == pd.end(d->getUnresolvedPackage().ppath))`
`547`	`549`	`{`
`548`	`550`	`data.dependencies.insert(&d->getTarget());`
`@@ -642,6 +644,8 @@ void VSGenerator::generate(const SwBuild &b)`
`642`	`644`	`// create datas`
`643`	`645`	`for (auto &st : s.settings)`
`644`	`646`	`p.getData(st).type = p.type;`
	`647`	`+`
	`648`	`+ bool has_deps = false;`
`645`	`649`	`for (auto &st : s.settings)`
`646`	`650`	`{`
`647`	`651`	`auto &d = p.getData(st);`
`@@ -669,6 +673,9 @@ void VSGenerator::generate(const SwBuild &b)`
`669`	`673`	`p1.dependencies.insert(&p); // add dependency for project`
`670`	`674`	`}`
`671`	`675`	`}`
	`676`	`+ if (deps.empty())`
	`677`	`+ continue;`
	`678`	`+ has_deps = true;`
`672`	`679`
`673`	`680`	`String deps_str;`
`674`	`681`	`for (auto &[d,s] : deps)`
`@@ -701,6 +708,9 @@ void VSGenerator::generate(const SwBuild &b)`
`701`	`708`	`be.command = "sw @" + normalize_path(rsp);`
`702`	`709`	`d.pre_build_event = be;`
`703`	`710`	`}`
	`711`	`+`
	`712`	`+ if (!has_deps)`
	`713`	`+ s.projects.erase(build_dependencies_name);`
`704`	`714`	`}`
`705`	`715`
`706`	`716`	`// add path dirs`
`@@ -721,7 +731,7 @@ void VSGenerator::generate(const SwBuild &b)`
`721`	`731`	`}`
`722`	`732`
`723`	`733`	`// set project dirs`
`724`		`- for (auto &[pkg, tgts] : b.getTargetsToBuild())`
	`734`	`+ for (auto &[pkg, tgts] : ttb)`
`725`	`735`	`{`
`726`	`736`	`for (auto &tgt : tgts)`
`727`	`737`	`{`