Merge BuildInfo::unique into update_from

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 3b0b296c2bdb1fb8f1955479f4f0929d15cc746e..d0524e84dab7af88e1d48f40c63fdded7b00e677 100644 (file)
--- 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)
 {
        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"));
 }
 
@@ -68,10 +73,6 @@ void SourcePackage::create_build_info()
        if(build_type)
                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());
-
        build_info.incpath.push_back((builder.get_prefix()/"include").str());
        build_info.libpath.push_back((builder.get_prefix()/"lib").str());