X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvcxprojectgenerator.cpp;h=bafa8d94f42ee629d84454171be34514e4b603e5;hb=d1eb133ab529cdae131be7b150209f03189248f3;hp=b5c42c5c2f0ce3715f552996ae47a28e25a49d1a;hpb=84da3f6c94dbe7e36aaf088890fda5fcf3b3efb0;p=builder.git

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index b5c42c5..bafa8d9 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -5,6 +5,7 @@
 #include "builder.h"
 #include "csourcefile.h"
 #include "executable.h"
+#include "internaltask.h"
 #include "sourcepackage.h"
 #include "vcxprojectfile.h"
 #include "vcxprojectgenerator.h"
@@ -12,11 +13,7 @@
 using namespace std;
 using namespace Msp;
 
-VcxProjectGenerator::VcxProjectGenerator(Builder &b):
-	Tool(b, "VCXG")
-{ }
-
-Target *VcxProjectGenerator::create_target(const list<Target *> &, const string &)
+Target *VcxProjectGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("Not implemented");
 }
@@ -24,32 +21,26 @@ Target *VcxProjectGenerator::create_target(const list<Target *> &, const string
 Task *VcxProjectGenerator::run(const Target &target) const
 {
 	const VcxProjectFile &project = dynamic_cast<const VcxProjectFile &>(target);
-	Worker *worker = new Worker(project);
-	return new InternalTask(worker);
+	return new InternalTask([&project]{ return _run(project); });
 }
 
-
-VcxProjectGenerator::Worker::Worker(const VcxProjectFile &t):
-	target(t)
-{ }
-
-void VcxProjectGenerator::Worker::main()
+bool VcxProjectGenerator::_run(const VcxProjectFile &project)
 {
-	const SourcePackage &spkg = *target.get_package();
+	const SourcePackage &spkg = *project.get_package();
 	Builder &builder = spkg.get_builder();
 
-	IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
+	IO::BufferedFile out(project.get_path().str(), IO::M_WRITE);
 	IO::print(out, "<Project DefaultTargets=\"Build\" ToolsVersion=\"4.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n");
 
 	IO::print(out, "\t<ItemGroup Label=\"ProjectConfigurations\">\n");
 	vector<string> build_types = builder.get_build_types();
-	const char *platforms[] = { "x86-32", "x86-64", 0 };
-	for(const char **i=platforms; *i; ++i)
-		for(vector<string>::const_iterator j=build_types.begin(); j!=build_types.end(); ++j)
+	const char *platforms[] = { "Win32", "x64" };
+	for(const char *p: platforms)
+		for(const string &b: build_types)
 		{
-			IO::print(out, "\t\t<ProjectConfiguration Include=\"%s|%s\">\n", *j, *i);
-			IO::print(out, "\t\t\t<Configuration>%s</Configuration>\n", *j);
-			IO::print(out, "\t\t\t<Platform>%s</Platform>\n", *i);
+			IO::print(out, "\t\t<ProjectConfiguration Include=\"%s|%s\">\n", b, p);
+			IO::print(out, "\t\t\t<Configuration>%s</Configuration>\n", b);
+			IO::print(out, "\t\t\t<Platform>%s</Platform>\n", p);
 			IO::print(out, "\t\t</ProjectConfiguration>\n");
 		}
 	IO::print(out, "\t</ItemGroup>\n");
@@ -57,26 +48,28 @@ void VcxProjectGenerator::Worker::main()
 	IO::print(out, "\t<PropertyGroup Label=\"Globals\">\n");
 	IO::print(out, "\t\t<VCProjectVersion>15.0</VCProjectVersion>\n");
 	IO::print(out, "\t\t<Keyword>MakeFileProj</Keyword>\n");
+	IO::print(out, "\t\t<ProjectGuid>{%s}</ProjectGuid>\n", project.get_guid());
 	IO::print(out, "\t</PropertyGroup>\n");
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n");
 
-	const Target *world = builder.get_build_graph().get_target("world");
-	const Target::Dependencies &world_deps = world->get_dependencies();
 	const Executable *exe = 0;
-	for(Target::Dependencies::const_iterator i=world_deps.begin(); (!exe && i!=world_deps.end()); ++i)
-		if((*i)->get_package()==&spkg)
-			exe = dynamic_cast<const Executable *>(*i);
+	for(const Target *t: builder.get_build_graph().get_target("world")->get_dependencies())
+		if(t->get_package()==&spkg)
+			if((exe = dynamic_cast<const Executable *>(t)))
+				break;
 
 	const char *argv0 = Application::get_argv0();
-	for(const char **i=platforms; *i; ++i)
-		for(vector<string>::const_iterator j=build_types.begin(); j!=build_types.end(); ++j)
+	const string &toolchain = builder.get_current_arch().get_toolchain();
+	for(const char *p: platforms)
+		for(const string &b: build_types)
 		{
-			IO::print(out, "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|%s'\" Label=\"Configuration\">\n", *j, *i);
+			string base_cmd = format("%s --arch=%s-%s --build-type=%s --prefix=%s", argv0, p, toolchain, b, builder.get_prefix());
+			IO::print(out, "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|%s'\" Label=\"Configuration\">\n", b, p);
 			IO::print(out, "\t\t<ConfigurationType>MakeFile</ConfigurationType>\n");
-			IO::print(out, "\t\t<NMakeBuildCommandLine>%s --arch=%s --build-type=%s</NMakeBuildCommandLine>\n", argv0, *i, *j);
-			IO::print(out, "\t\t<NMakeCleanCommandLine>%s --arch=%s --build-type=%s -c</NMakeCleanCommandLine>\n", argv0, *i, *j);
-			IO::print(out, "\t\t<NMakeReBuildCommandLine>%s --arch=%s --build-type=%s -B</NMakeReBuildCommandLine>\n", argv0, *i, *j);
+			IO::print(out, "\t\t<NMakeBuildCommandLine>%s</NMakeBuildCommandLine>\n", base_cmd);
+			IO::print(out, "\t\t<NMakeCleanCommandLine>%s -c</NMakeCleanCommandLine>\n", base_cmd);
+			IO::print(out, "\t\t<NMakeReBuildCommandLine>%s -B</NMakeReBuildCommandLine>\n", base_cmd);
 			if(exe)
 				IO::print(out, "\t\t<NMakeOutput>%s</NMakeOutput>\n", exe->get_path());
 			IO::print(out, "\t</PropertyGroup>\n");
@@ -84,13 +77,20 @@ void VcxProjectGenerator::Worker::main()
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.props\" />\n");
 
-	const BuildGraph::TargetMap &targets = builder.get_build_graph().get_targets();
 	vector<const FileTarget *> sources;
 	vector<const FileTarget *> includes;
 	vector<const FileTarget *> others;
-	for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->get_package()==&spkg && !i->second->is_buildable())
-			if(const FileTarget *file = dynamic_cast<const FileTarget *>(i->second))
+	BuildInfo build_info;
+	for(const auto &kvp: builder.get_build_graph().get_targets())
+		if(kvp.second->get_package()==&spkg)
+		{
+			if(kvp.second->is_buildable())
+			{
+				BuildInfo tgt_binfo;
+				kvp.second->collect_build_info(tgt_binfo);
+				build_info.update_from(tgt_binfo, BuildInfo::CHAINED);
+			}
+			else if(const FileTarget *file = dynamic_cast<const FileTarget *>(kvp.second))
 			{
 				if(dynamic_cast<const CSourceFile *>(file))
 				{
@@ -103,24 +103,35 @@ void VcxProjectGenerator::Worker::main()
 				else
 					others.push_back(file);
 			}
+		}
+
+	if(!build_info.incpath.empty())
+	{
+		IO::print(out, "\t<PropertyGroup>\n");
+		string path_str;
+		for(const FS::Path &p: build_info.incpath)
+			append(path_str, ";", p.str());
+		IO::print(out, "\t\t<NMakeIncludeSearchPath>%s</NMakeIncludeSearchPath>\n", path_str);
+		IO::print(out, "\t</PropertyGroup>\n");
+	}
 
 	IO::print(out, "\t<ItemGroup>\n");
-	for(vector<const FileTarget *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-		IO::print(out, "\t\t<ClCompile Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *s: sources)
+		IO::print(out, "\t\t<ClCompile Include=\"%s\" />\n", s->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<ItemGroup>\n");
-	for(vector<const FileTarget *>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
-		IO::print(out, "\t\t<ClInclude Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *i: includes)
+		IO::print(out, "\t\t<ClInclude Include=\"%s\" />\n", i->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<ItemGroup>\n");
-	for(vector<const FileTarget *>::const_iterator i=others.begin(); i!=others.end(); ++i)
-		IO::print(out, "\t\t<None Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *t: others)
+		IO::print(out, "\t\t<None Include=\"%s\" />\n", t->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\" />\n");
 	IO::print(out, "</Project>\n");
 
-	status = Task::SUCCESS;
+	return true;
 }