Better circular dependency handling on windows. Improve tests. Put produced executables into binary folder.

egorpugin · egorpugin · commit a46a9ace27e4 · 2019-04-05T21:21:37.000+03:00
diff --git a/src/client/client.cpp b/src/client/client.cpp
@@ -862,6 +862,17 @@ void override_package_perform()
     }
 }
 
+SUBCOMMAND_DECL(mirror)
+{
+    enum storage_file_type
+    {
+        SourceArchive,
+        SpecificationFirstFile,
+        About,
+        BuildArchive, // binary archive?
+    };
+}
+
 SUBCOMMAND_DECL(ide)
 {
     //useFileMonitor = false;
diff --git a/src/client/commands.inl b/src/client/commands.inl
@@ -26,6 +26,7 @@ SUBCOMMAND(ide, "Used to invoke sw application to do IDE tasks: generate project
 SUBCOMMAND(create, "Create different projects.") COMMA
 SUBCOMMAND(install, "Add package to lock.") COMMA
 SUBCOMMAND(list, "List packages in database.") COMMA
+SUBCOMMAND(mirror, "Manage software mirrors.") COMMA
 SUBCOMMAND(pack, "Used to prepare distribution packages.") COMMA
 SUBCOMMAND(remote, "Manage remotes.") COMMA
 SUBCOMMAND(remove, "Remove package.") COMMA
diff --git a/src/driver/compiler.cpp b/src/driver/compiler.cpp
@@ -1011,7 +1011,9 @@ CompilerBaseProgram::CompilerBaseProgram(const CompilerBaseProgram &rhs)
 
 std::shared_ptr<builder::Command> CompilerBaseProgram::getCommand() const
 {
-    if (!cmd || !prepared)
+    if (!cmd)
+        throw SW_RUNTIME_ERROR("Command is not created");
+    if (!prepared)
         throw SW_RUNTIME_ERROR("Command is not prepared");
     return cmd;
 }
diff --git a/src/driver/options_cl.yml b/src/driver/options_cl.yml
@@ -471,6 +471,17 @@ types:
     vslib:
         name: VisualStudioLibrarianOptions
 
+        flags:
+            def:
+                name: CreateImportLibrary
+                type: bool
+                flag: DEF
+
+            name:
+                name: DllName
+                type: String
+                flag: "Name:"
+
     # https://docs.microsoft.com/en-us/cpp/build/reference/linker-options
     vslink:
         name: VisualStudioLinkerOptions
diff --git a/src/driver/target/native.cpp b/src/driver/target/native.cpp
@@ -221,11 +221,14 @@ void NativeExecutedTarget::setOutputFile()
     if (Scope == TargetScope::Build)
     {
         if (getSelectedTool() == Librarian.get())
-            getSelectedTool()->setOutputFile(getOutputFileName2());
+            getSelectedTool()->setOutputFile(getOutputFileName2("lib"));
         else
         {
-            getSelectedTool()->setOutputFile(getOutputFileName(getOutputBaseDir()));
-            getSelectedTool()->setImportLibrary(getOutputFileName2());
+            if (getType() == TargetType::NativeExecutable)
+                getSelectedTool()->setOutputFile(getOutputFileName2("bin"));
+            else
+                getSelectedTool()->setOutputFile(getOutputFileName(getOutputBaseDir()));
+            getSelectedTool()->setImportLibrary(getOutputFileName2("lib"));
         }
     }
     else
@@ -263,7 +266,7 @@ path NativeExecutedTarget::getOutputFileName(const path &root) const
     return p;
 }
 
-path NativeExecutedTarget::getOutputFileName2() const
+path NativeExecutedTarget::getOutputFileName2(const path &subdir) const
 {
     if (SW_IS_LOCAL_BINARY_DIR)
     {
@@ -274,7 +277,7 @@ path NativeExecutedTarget::getOutputFileName2() const
         if (IsConfig)
             return getOutputFileName("");
         else
-            return BinaryDir.parent_path() / "lib" / getOutputFileName();
+            return BinaryDir.parent_path() / subdir / getOutputFileName();
     }
 }
 
@@ -907,40 +910,8 @@ Commands NativeExecutedTarget::getCommands1() const
         // link deps
         if (getSelectedTool() != Librarian.get())
         {
-            for (auto &l : gatherDependenciesTargets())
-            {
-                if (auto c2 = ((NativeExecutedTarget*)l)->getCommand())
-                    c->dependencies.insert(c2);
-            }
-
-            // check circular, resolve if possible
-            for (auto &d : CircularDependencies)
-            {
-                auto dt = ((NativeExecutedTarget*)d->target);
-                auto non_circ_cmd = dt->getSelectedTool()->getCommand(*this);
-
-                // one command must be executed after the second to free implib files from any compiler locks
-                // we choose it based on ptr address
-                //if (c < non_circ_cmd)
-                c->dependencies.erase(non_circ_cmd);
-
-                if (dt->CircularLinker)
-                {
-                    auto cd = dt->CircularLinker->getCommand(*this);
-                    c->dependencies.insert(cd);
-                }
-                //cmds.insert(cd);
-            }
-
-            if (CircularLinker)
-            {
-                // execute this command after unresolved (circular) cmd
-                c->dependencies.insert(CircularLinker->getCommand(*this));
-
-                // we reset generator of implib from usual build command (c = getCommand()) to circular linker generator to overcome
-                // automatic circular dependency generation in command.cpp
-                //File(getImportLibrary()).getFileRecord().generator = CircularLinker->getCommand();
-            }
+            if (circular_dependency)
+                cmds.insert(Librarian->getCommand(*this));
         }
 
         cmds.insert(c);
@@ -1997,6 +1968,8 @@ bool NativeExecutedTarget::prepare()
     case 6:
         // link libraries
     {
+        auto L = Linker->as<VisualStudioLinker>();
+
         // add link libraries from deps
         if (!HeaderOnly.value() && getSelectedTool() != Librarian.get())
         {
@@ -2011,30 +1984,19 @@ bool NativeExecutedTarget::prepare()
 
                 auto dt = ((NativeExecutedTarget*)d->target);
 
-                for (auto &d2 : dt->Dependencies)
+                // circular deps detection
+                if (L)
                 {
-                    if (d2->target != this)
-                        continue;
-                    if (d2->IncludeDirectoriesOnly)
-                        continue;
-
-                    CircularDependencies.insert(d.get());
-                }
-
-                if (!CircularDependencies.empty())
-                {
-                    CircularLinker = std::static_pointer_cast<NativeLinker>(getSelectedTool()->clone());
-
-                    // set to temp paths
-                    auto o = IsConfig;
-                    IsConfig = true;
-                    CircularLinker->setOutputFile(getOutputFileName(getOutputBaseDir()));
-                    CircularLinker->setImportLibrary(getOutputFileName2());
-                    IsConfig = o;
-
-                    if (auto c = CircularLinker->as<VisualStudioLinker>())
+                    for (auto &d2 : dt->Dependencies)
                     {
-                        c->Force = vs::ForceType::Unresolved;
+                        if (d2->target != this)
+                            continue;
+                        if (d2->IncludeDirectoriesOnly)
+                            continue;
+
+                        circular_dependency = true;
+                        L->ImportLibrary.clear();
+                        break;
                     }
                 }
 
@@ -2077,30 +2039,26 @@ bool NativeExecutedTarget::prepare()
         auto obj = gatherObjectFilesWithoutLibraries();
         auto O1 = gatherLinkLibraries();
 
-        if (CircularLinker)
+        if (!HeaderOnly.value() && getSelectedTool() != Librarian.get())
         {
-            // O1 -= Li
-            for (auto &d : CircularDependencies)
-                O1.erase(std::remove(O1.begin(), O1.end(), ((NativeTarget*)d->target)->getImportLibrary()), O1.end());
-
-            // CL1 = O1
-            CircularLinker->setInputLibraryDependencies(O1);
+            for (auto &f : ::sw::gatherSourceFiles<RcToolSourceFile>(*this))
+                obj.insert(f->output.file);
+        }
 
-            // O1 += CLi
-            for (auto &d : CircularDependencies)
+        if (circular_dependency)
+        {
+            Librarian->setObjectFiles(obj);
+            Librarian->setOutputFile(getOutputFileName2("lib"));
+            if (auto L = Librarian->as<VisualStudioLibrarian>())
             {
-                if (d->target && ((NativeExecutedTarget*)d->target)->CircularLinker)
-                    O1.push_back(((NativeExecutedTarget*)d->target)->CircularLinker->getImportLibrary());
+                L->CreateImportLibrary = true;
+                L->DllName = Linker->getOutputFile().filename().u8string();
             }
 
-            // prepare command here to prevent races
-            CircularLinker->getCommand(*this);
-        }
-
-        if (!HeaderOnly.value() && getSelectedTool() != Librarian.get())
-        {
-            for (auto &f : ::sw::gatherSourceFiles<RcToolSourceFile>(*this))
-                obj.insert(f->output.file);
+            auto exp = Librarian->getImportLibrary();
+            exp = exp.parent_path() / (exp.stem().u8string() + ".exp");
+            Librarian->createCommand()->addOutput(exp);
+            obj.insert(exp);
         }
 
         getSelectedTool()->setObjectFiles(obj);
diff --git a/src/driver/target/native.h b/src/driver/target/native.h
@@ -161,12 +161,8 @@ struct SW_DRIVER_CPP_API NativeExecutedTarget : NativeTarget,
 #undef STD_MACRO
 
 protected:
-    using once_mutex_t = std::recursive_mutex;
-
-    once_mutex_t once;
     mutable NativeLinker *SelectedTool = nullptr;
-    UniqueVector<Dependency*> CircularDependencies;
-    std::shared_ptr<NativeLinker> CircularLinker;
+    bool circular_dependency = false;
 
     Files gatherObjectFiles() const;
     Files gatherObjectFilesWithoutLibraries() const;
@@ -185,7 +181,7 @@ struct SW_DRIVER_CPP_API NativeExecutedTarget : NativeTarget,
 
     using Target::getOutputFileName;
     path getOutputFileName(const path &root) const;
-    path getOutputFileName2() const;
+    path getOutputFileName2(const path &subdir) const;
     Commands getGeneratedCommands() const;
     void resolvePostponedSourceFiles();
     void gatherStaticLinkLibraries(LinkLibrariesType &ll, Files &added, std::unordered_set<NativeExecutedTarget*> &targets, bool system);
diff --git a/test/build/cpp/dep/circular/dll/a.cpp b/test/build/cpp/dep/circular/dll/a.cpp
@@ -1,14 +1,5 @@
-#include <iostream>
-
-MY_A_API void a()
-{
-    std::cout << "Hello, A World!\n";
-}
 MY_B_API void b();
-
-int main()
+MY_A_API void a()
 {
-    a();
     b();
-    return 0;
 }
diff --git a/test/build/cpp/dep/circular/dll/b.cpp b/test/build/cpp/dep/circular/dll/b.cpp
@@ -1,14 +1,5 @@
-#include <iostream>
-
-MY_B_API void b()
-{
-    std::cout << "Hello, B World!\n";
-}
 MY_A_API void a();
-
-int main()
+MY_B_API void b()
 {
     a();
-    b();
-    return 0;
 }
diff --git a/test/build/cpp/dep/circular/exe_dll/b.cpp b/test/build/cpp/dep/circular/exe_dll/b.cpp
@@ -1,15 +1,5 @@
-#include <iostream>
-
-MY_B_API int b(int a)
-{
-    return a * 2;
-}
 MY_A_API int a(int);
-
-int main()
+MY_B_API int b(int aa)
 {
-    auto r = b(5);
-    r = a(r);
-    std::cout << r;
-    return 0;
+    return a(aa) * 2;
 }

Original file line number	Diff line number	Diff line change
`@@ -862,6 +862,17 @@ void override_package_perform()`
`862`	`862`	`}`
`863`	`863`	`}`
`864`	`864`
	`865`	`+SUBCOMMAND_DECL(mirror)`
	`866`	`+{`
	`867`	`+ enum storage_file_type`
	`868`	`+ {`
	`869`	`+ SourceArchive,`
	`870`	`+ SpecificationFirstFile,`
	`871`	`+ About,`
	`872`	`+ BuildArchive, // binary archive?`
	`873`	`+ };`
	`874`	`+}`
	`875`	`+`
`865`	`876`	`SUBCOMMAND_DECL(ide)`
`866`	`877`	`{`
`867`	`878`	`//useFileMonitor = false;`
Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,9 @@ CompilerBaseProgram::CompilerBaseProgram(const CompilerBaseProgram &rhs)`
`1011`	`1011`
`1012`	`1012`	`std::shared_ptr<builder::Command> CompilerBaseProgram::getCommand() const`
`1013`	`1013`	`{`
`1014`		`- if (!cmd \|\| !prepared)`
	`1014`	`+ if (!cmd)`
	`1015`	`+ throw SW_RUNTIME_ERROR("Command is not created");`
	`1016`	`+ if (!prepared)`
`1015`	`1017`	`throw SW_RUNTIME_ERROR("Command is not prepared");`
`1016`	`1018`	`return cmd;`
`1017`	`1019`	`}`