X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=22330b2970dd4184db97d783a6646be4bc30da4f;hb=7bf0b5d013b88b0408031e2d6594357e71c8138f;hp=3b0b296c2bdb1fb8f1955479f4f0929d15cc746e;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 3b0b296..22330b2 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,9 +1,11 @@
 #include <cstdlib>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
+#include "file.h"
 #include "misc.h"
 #include "pkgconfigfile.h"
 #include "tool.h"
@@ -20,15 +22,18 @@ bool component_sort(const Component &c1, const Component &c2)
 }
 
 
-SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 	Package(b, n),
-	source_dir(s),
+	source_dir(FS::dirname(f)),
 	build_type(0),
 	config(*this),
-	deps_cache(*this)
+	cache(*this)
 {
 	config.load();
 
+	build_file = builder.get_vfs().get_target(f);
+	if(!build_file)
+		build_file = new File(builder, *this, f);
 	components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
@@ -65,42 +70,44 @@ FS::Path SourcePackage::get_out_dir() const
 
 void SourcePackage::create_build_info()
 {
+	BuildInfo final_build_info;
+
 	if(build_type)
-		build_info.update_from(build_type->get_build_info());
+		final_build_info.update_from(build_type->get_build_info());
 
-	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
-	const StringList &warnings = builder.get_warnings();
-	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	bool export_paths = false;
-	for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
-		export_paths = (i->get_type()==Component::LIBRARY);
-
-	if(export_paths)
-	{
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
-	}
-
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
 			build_info.defines["WITH_"+toupper(i->name)] = "1";
 
+	bool export_paths = false;
 	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
 	{
 		i->prepare();
 		i->create_build_info();
+
 		if(i->get_type()==Component::LIBRARY)
+		{
 			export_binfo.libs.push_back(i->get_name());
+			export_paths = true;
+		}
+	}
+
+	if(export_paths)
+	{
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 	}
 }
 
 void SourcePackage::create_targets()
 {
-	deps_cache.load();
+	cache.load();
 
 	bool pc_needed = false;
 	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
@@ -120,7 +127,7 @@ void SourcePackage::create_targets()
 void SourcePackage::save_caches()
 {
 	config.save();
-	deps_cache.save();
+	cache.save();
 }