X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfigaction.cpp;h=33687ebb5251ea9465d4331d00578d6e7a522223;hb=dc00ddd224634c86f0a470f1f6f534be5d3e64a3;hp=c390fbd0e0a47dd45ee1e72995513411914e4866;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/pkgconfigaction.cpp b/source/pkgconfigaction.cpp
index c390fbd..33687eb 100644
--- a/source/pkgconfigaction.cpp
+++ b/source/pkgconfigaction.cpp
@@ -1,65 +1,54 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <fstream>
-#include <iostream>
-#include <msp/path/utils.h>
+#include <msp/fs/utils.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
+#include "builder.h"
 #include "package.h"
 #include "pkgconfig.h"
 #include "pkgconfigaction.h"
 
 using namespace std;
+using namespace Msp;
 
 PkgConfigAction::PkgConfigAction(Builder &b, const PkgConfig &p):
 	Action(b)
 {
-	const SourcePackage &spkg=*static_cast<const SourcePackage *>(p.get_package());
+	const SourcePackage &spkg = *static_cast<const SourcePackage *>(p.get_package());
 
-	announce(spkg.get_name(), "PC", relative(p.get_name(), spkg.get_source()).str());
+	announce(spkg.get_name(), "PC", basename(p.get_path()));
 
-	ofstream out(p.get_name().c_str());
-	if(out)
-	{
-		// Prefix is already included in the various paths
-		//out<<"prefix="<<pkg.get_prefix()<<"\n\n";
-		out<<"source="<<spkg.get_source()<<"\n\n";
+	IO::BufferedFile out(p.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());
 
-		out<<"Name: "<<spkg.get_name()<<'\n';
-		out<<"Description: "<<spkg.get_description()<<'\n';
-		out<<"Version: "<<spkg.get_version()<<'\n';
+	IO::print(out, "Name: %s\n", spkg.get_name());
+	IO::print(out, "Description: %s\n", spkg.get_description());
+	IO::print(out, "Version: %s\n", spkg.get_version());
 
-		out<<"Requires:";
-		const PkgRefList &reqs=spkg.get_requires();
-		for(PkgRefList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
-			if(i->get_package()->get_use_pkgconfig())
-				out<<' '<<i->get_name();
-		out<<'\n';
+	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());
+	out.put('\n');
 
-		const BuildInfo &binfo=spkg.get_exported_binfo();
-		out<<"Libs:";
-		for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-			out<<" -L"<<*i;
-		for(StringList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-			out<<" -l"<<*i;
-		for(StringList::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
-			out<<' '<<*i;
-		out<<'\n';
+	const BuildInfo &binfo = spkg.get_exported_binfo();
+	IO::print(out, "Libs:");
+	for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
+		IO::print(out, " -L%s", prefixify(*i));
+	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);
+	out.put('\n');
 
-		out<<"Cflags:";
-		for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-			out<<" -I"<<*i;
-		for(StringList::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-			out<<" -D"<<*i;
-		for(StringList::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-			out<<' '<<*i;
-		out<<'\n';
-	}
-	else
-		cerr<<"Can't open "<<p.get_name()<<" for writing\n";
+	IO::print(out, "Cflags:");
+	for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+		IO::print(out, " -I%s", prefixify(*i));
+	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);
+	out.put('\n');
 }
 
 int PkgConfigAction::check()
@@ -67,3 +56,11 @@ int PkgConfigAction::check()
 	signal_done.emit();
 	return 0;
 }
+
+string PkgConfigAction::prefixify(const std::string &path)
+{
+	const string &prefix = builder.get_prefix().str();
+	if(!path.compare(0, prefix.size(), prefix))
+		return "${prefix}"+path.substr(prefix.size());
+	return path;
+}