Tune: Add initial .dll generation with main entrypoint for launching script

tapika · tapika · commit 5855cba2b7ab · 2019-04-17T20:17:36.000+03:00
diff --git a/SolutionProjectModel/cppexec/cppexec.cpp b/SolutionProjectModel/cppexec/cppexec.cpp
@@ -35,8 +35,8 @@ string getFileExtension( const wchar_t* filePath )
 
 int _wmain(int argc, wchar_t** argv)
 {
-    path exePath(argv[0]);
-    auto exeDir = weakly_canonical(exePath).parent_path();
+    path exePath = weakly_canonical(argv[0]);
+    auto exeDir = exePath.parent_path();
     path scriptToRun;
 
     for (auto& pit : directory_iterator(exeDir))
@@ -131,14 +131,32 @@ int _wmain(int argc, wchar_t** argv)
             c.General.OutDir = LR"(.\)";
             c.General.UseDebugLibraries = true;
             c.General.LinkIncremental = true;
+            c.General.ConfigurationType = conftype_DynamicLibrary;
             c.CCpp.Optimization.Optimization = optimization_Disabled;
-            c.CCpp.General.AdditionalIncludeDirectories = exeDir.append("SolutionProjectModel").c_str();
+            c.CCpp.General.AdditionalIncludeDirectories = path(exeDir).append("SolutionProjectModel").c_str();
             c.CCpp.Language.LanguageStandard = cpplang_stdcpp17;
             c.Linker.System.SubSystem = subsystem_Windows;
             c.Linker.Debugging.GenerateDebugInformation = debuginfo_true;
         }
     );
 
+    auto dll = path(exeDir).append("SolutionProjectModel.dll");
+    auto f = p.File(dll.c_str(), true);
+    f->General.ItemType = CustomBuild;
+    auto exePathRelative = relative(exePath, projectDir);
+    f->VisitTool(
+        [&](PlatformConfigurationProperties* props)
+        {
+            CustomBuildToolProperties& custtool = *((CustomBuildToolProperties*)props);
+            CStringW cmd = CStringW("\"") + exePathRelative.c_str() + "\" %(FullPath) >$(IntermediateOutputPath)%(Filename).def";
+            cmd += "\n";
+            cmd += "lib /nologo /def:$(IntermediateOutputPath)%(Filename).def /machine:$(Platform) /out:$(IntermediateOutputPath)%(Filename)_lib.lib";
+            custtool.Message = "Generating static library for %(Identity)...";
+            custtool.Command = cmd;
+            custtool.Outputs = "$(IntermediateOutputPath)%(Filename)_lib.lib";
+        }
+    , &CustomBuildToolProperties::GetType());
+
     if( !p.Save() )
     {
         printf("Error: Could not save project file '%S'", scriptToRun.stem().c_str() );
diff --git a/SolutionProjectModel/testCppApp.cpp b/SolutionProjectModel/testCppApp.cpp
@@ -4,7 +4,7 @@
 using namespace std;
 using namespace filesystem;
 
-void main(void)
+void __declspec(dllexport) main(void)
 {
     Project p(L"HelloWorld");
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using namespace std;`
`5`	`5`	`using namespace filesystem;`
`6`	`6`
`7`		`-void main(void)`
	`7`	`+void __declspec(dllexport) main(void)`
`8`	`8`	`{`
`9`	`9`	`Project p(L"HelloWorld");`
`10`	`10`