X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdependencycache.cpp;h=a4211a3193066bc3049921026c60df2877c2f2c4;hb=c8dfe708b5551818dad3f6cf3e86cc72fe684572;hp=08d8af7538630f69cf1873672eed289b3a9d8d8e;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/dependencycache.cpp b/source/dependencycache.cpp
index 08d8af7..a4211a3 100644
--- a/source/dependencycache.cpp
+++ b/source/dependencycache.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/maputils.h>
 #include <msp/fs/stat.h>
-#include <msp/io/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
@@ -24,25 +17,28 @@ DependencyCache::DependencyCache(SourcePackage &p):
 
 void DependencyCache::set_deps(const string &tgt, const StringList &d)
 {
-	deps[tgt]=d;
-	changed=true;
+	deps[tgt] = d;
+	changed = true;
 }
 
-const StringList &DependencyCache::get_deps(const string &tgt) const
+bool DependencyCache::has_deps(const string &tgt) const
 {
-	DepsMap::const_iterator i=deps.find(tgt);
-	if(i==deps.end())
-		throw KeyError("Unknown dependencies", tgt);
+	return deps.count(tgt);
+}
 
-	return i->second;
+const StringList &DependencyCache::get_deps(const string &tgt) const
+{
+	return get_item(deps, tgt);
 }
 
 void DependencyCache::save() const
 {
-	if(deps.empty() || !changed || package.get_builder().get_dry_run())
+	if(deps.empty() || !changed)
 		return;
 
-	IO::BufferedFile out((package.get_source()/".deps").str(), IO::M_WRITE);
+	FS::Path fn = package.get_source_directory()/".deps";
+	package.get_builder().get_logger().log("files", format("Writing %s", fn));
+	IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
 	for(DepsMap::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 	{
@@ -55,21 +51,20 @@ void DependencyCache::save() const
 
 void DependencyCache::load()
 {
-	string fn=(package.get_source()/".deps").str();
+	FS::Path fn = package.get_source_directory()/".deps";
 
-	try
+	if(FS::Stat st = FS::stat(fn))
 	{
-		IO::BufferedFile in(fn);
+		package.get_builder().get_logger().log("files", format("Reading %s", fn));
+		IO::BufferedFile in(fn.str());
 
 		string line;
 		while(in.getline(line))
 		{
-			vector<string> parts=split(line, '|');
-			deps[parts[0]]=StringList(parts.begin()+1, parts.end());
+			vector<string> parts = split(line, '|');
+			deps[parts[0]] = StringList(parts.begin()+1, parts.end());
 		}
 
-		mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+		mtime = st.get_modify_time();
 	}
-	catch(const IO::FileNotFound &)
-	{ }
 }