X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvssolutiongenerator.cpp;h=5fd8e4dff2a10d0371227f9f76c136ef0d04ba4b;hb=d1eb133ab529cdae131be7b150209f03189248f3;hp=43ed761cb52daa641388ad872596dacaa1ed30ce;hpb=b5a0caaec5b617ecccda6dc116da076eaf662f4e;p=builder.git

diff --git a/source/vssolutiongenerator.cpp b/source/vssolutiongenerator.cpp
index 43ed761..5fd8e4d 100644
--- a/source/vssolutiongenerator.cpp
+++ b/source/vssolutiongenerator.cpp
@@ -2,6 +2,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
+#include "internaltask.h"
 #include "sourcepackage.h"
 #include "vcxprojectfile.h"
 #include "vssolutionfile.h"
@@ -10,11 +11,7 @@
 using namespace std;
 using namespace Msp;
 
-VsSolutionGenerator::VsSolutionGenerator(Builder &b):
-	Tool(b, "VSSG")
-{ }
-
-Target *VsSolutionGenerator::create_target(const list<Target *> &, const string &)
+Target *VsSolutionGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("Not implemented");
 }
@@ -22,57 +19,51 @@ Target *VsSolutionGenerator::create_target(const list<Target *> &, const string
 Task *VsSolutionGenerator::run(const Target &target) const
 {
 	const VsSolutionFile &solution = dynamic_cast<const VsSolutionFile &>(target);
-	Worker *worker = new Worker(solution);
-	return new InternalTask(worker);
+	return new InternalTask([&solution]{ return _run(solution); });
 }
 
-
-VsSolutionGenerator::Worker::Worker(const VsSolutionFile &t):
-	target(t)
-{ }
-
-void VsSolutionGenerator::Worker::main()
+bool VsSolutionGenerator::_run(const VsSolutionFile &solution)
 {
-	Builder &builder = target.get_package()->get_builder();
+	const SourcePackage &spkg = *solution.get_package();
+	Builder &builder = spkg.get_builder();
 
-	IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
+	IO::BufferedFile out(solution.get_path().str(), IO::M_WRITE);
 	IO::print(out, "Microsoft Visual Studio Solution File, Format Version 12.00\n");
 	IO::print(out, "MinimumVisualStudioVersion = 10.0.40219.1\n");
 
-	const Target::Dependencies &deps = target.get_dependencies();
 	vector<const VcxProjectFile *> projects;
-	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(const VcxProjectFile *project = dynamic_cast<const VcxProjectFile *>(*i))
+	for(const Target *t: solution.get_dependencies())
+		if(const VcxProjectFile *project = dynamic_cast<const VcxProjectFile *>(t))
 			projects.push_back(project);
 
-	for(vector<const VcxProjectFile *>::const_iterator i=projects.begin(); i!=projects.end(); ++i)
+	for(const VcxProjectFile *p: projects)
 	{
-		const SourcePackage *pkg = (*i)->get_package();
+		const SourcePackage *pkg = p->get_package();
 		IO::print(out, "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"%s\", \"%s\", \"{%s}\"\nEndProject\n",
-			pkg->get_name(), (*i)->get_path(), (*i)->get_guid());
+			pkg->get_name(), p->get_path(), p->get_guid());
 	}
 
 	vector<string> build_types = builder.get_build_types();
-	const char *platforms[] = { "x86", "x64", 0 };
+	const char *platforms[] = { "x86", "x64" };
 
 	IO::print(out, "Global\n");
 	IO::print(out, "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n");
-	for(vector<string>::const_iterator i=build_types.begin(); i!=build_types.end(); ++i)
-		for(const char **j=platforms; *j; ++j)
-			IO::print(out, "\t\t%s|%s = %s|%s\n", *i, *j, *i, *j);
+	for(const string &t: build_types)
+		for(const char *p: platforms)
+			IO::print(out, "\t\t%s|%s = %s|%s\n", t, p, t, p);
 	IO::print(out, "\tEndGlobalSection\n");
 	IO::print(out, "\tGlobalSection(ProjectConfigurationPlatforms) = postSolution\n");
-	for(vector<const VcxProjectFile *>::const_iterator i=projects.begin(); i!=projects.end(); ++i)
-		for(vector<string>::const_iterator j=build_types.begin(); j!=build_types.end(); ++j)
-			for(const char **k=platforms; *k; ++k)
+	for(const VcxProjectFile *p: projects)
+		for(const string &t: build_types)
+			for(const char *f: platforms)
 			{
-				const char *project_platform = (!strcmp(*k, "x86") ? "Win32" : *k);
-				IO::print(out, "\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n", (*i)->get_guid(), *j, *k, *j, project_platform);
-				if(i==projects.begin())
-					IO::print(out, "\t\t{%s}.%s|%s.Build.0 = %s|%s\n", (*i)->get_guid(), *j, *k, *j, project_platform);
+				const char *project_platform = (!strcmp(f, "x86") ? "Win32" : f);
+				IO::print(out, "\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n", p->get_guid(), t, f, t, project_platform);
+				if(p->get_package()==&spkg)
+					IO::print(out, "\t\t{%s}.%s|%s.Build.0 = %s|%s\n", p->get_guid(), t, f, t, project_platform);
 			}
 	IO::print(out, "\tEndGlobalSection\n");
 	IO::print(out, "EndGlobal\n");
 
-	status = Task::SUCCESS;
+	return true;
 }