X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;h=f042ec5f25a32d502849379d88c762f300494e8c;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=708a9130ed63e6c158df084dbba9b01ae29b2369;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 708a913..f042ec5 100644
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -2,7 +2,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
-#include "pkgconfig.h"
+#include "pkgconfigfile.h"
 #include "pkgconfiggenerator.h"
 
 using namespace std;
@@ -13,61 +13,72 @@ PkgConfigGenerator::PkgConfigGenerator(Builder &b):
 {
 }
 
-Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &) const
+Target *PkgConfigGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("Not implemented");
 }
 
 Task *PkgConfigGenerator::run(const Target &target) const
 {
-	const PkgConfig &pkgc = dynamic_cast<const PkgConfig &>(target);
+	const PkgConfigFile &pkgc = dynamic_cast<const PkgConfigFile &>(target);
 	Worker *worker = new Worker(pkgc);
 	return new InternalTask(worker);
 }
 
 
-PkgConfigGenerator::Worker::Worker(const PkgConfig &t):
+PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t):
 	target(t)
-{
-	launch();
-}
+{ }
 
 void PkgConfigGenerator::Worker::main()
 {
 	Builder &builder = target.get_package()->get_builder();
-	const SourcePackage &spkg = dynamic_cast<const SourcePackage &>(*target.get_package());
+	const SourcePackage &spkg = *target.get_package();
 
 	IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
 	IO::print(out, "prefix=%s\n", builder.get_prefix().str());
-	IO::print(out, "source=%s\n\n", spkg.get_source());
+	IO::print(out, "source=%s\n\n", spkg.get_source_directory());
 
-	IO::print(out, "Name: %s\n", spkg.get_name());
+	IO::print(out, "Name: %s\n", spkg.get_label());
 	IO::print(out, "Description: %s\n", spkg.get_description());
 	IO::print(out, "Version: %s\n", spkg.get_version());
 
 	IO::print(out, "Requires:");
-	const PackageList &reqs = spkg.get_requires();
-	for(PackageList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
-		if((*i)->get_use_pkgconfig())
-			IO::print(out, " %s", (*i)->get_name());
+	for(const Package *r: spkg.get_required_packages())
+		if(r->uses_pkgconfig())
+			IO::print(out, " %s", r->get_name());
 	out.put('\n');
 
-	const BuildInfo &binfo = spkg.get_exported_binfo();
+	const BuildInfo &binfo = spkg.get_exported_build_info();
 	IO::print(out, "Libs:");
-	for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-		IO::print(out, " -L%s", FS::relative(*i, builder.get_prefix()).str());
-	for(StringList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-		IO::print(out, " -l%s", *i);
-	for(StringList::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
-		IO::print(out, " %s", *i);
+	for(const FS::Path &p: binfo.libpath)
+		IO::print(out, " -L%s", prefixify(p, builder.get_prefix()));
+	for(const string &l: binfo.libs)
+		IO::print(out, " -l%s", l);
+	if(binfo.threads)
+		out.write("-pthread");
 	out.put('\n');
 
 	IO::print(out, "Cflags:");
-	for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		IO::print(out, " -I%s", FS::relative(*i, builder.get_prefix()).str());
-	for(StringList::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-		IO::print(out, " -D%s", *i);
-	for(StringList::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-		IO::print(out, " %s", *i);
+	for(const FS::Path &p: binfo.incpath)
+		IO::print(out, " -I%s", prefixify(p, builder.get_prefix()));
+	for(const auto &kvp: binfo.defines)
+		if(kvp.second.empty())
+			IO::print(out, " -D%s", kvp.first);
+		else
+			IO::print(out, " -D%s=%s", kvp.first, kvp.second);
 	out.put('\n');
+
+	status = Task::SUCCESS;
+}
+
+string PkgConfigGenerator::Worker::prefixify(const FS::Path &path, const FS::Path &prefix)
+{
+	if(FS::descendant_depth(path, prefix)>=0)
+	{
+		FS::Path rel_path = FS::relative(path, prefix);
+		return "${prefix}"+rel_path.str().substr(1);
+	}
+	else
+		return path.str();
 }