X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=9fdb8ee6a56e6b9fb5dfa709cd8d6e90cfdd596e;hb=25376a637c584fc9d491bb6a40c4c483341418b0;hp=b6f29f845108b300c30218c80d7a66dde8af5f14;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index b6f29f8..9fdb8ee 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -21,15 +21,13 @@
 #include "gnuccompiler.h"
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
-#include "header.h"
-#include "install.h"
+#include "installedfile.h"
 #include "misc.h"
 #include "package.h"
 #include "pkgconfig.h"
 #include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemlibrary.h"
 #include "tar.h"
 #include "task.h"
 #include "virtualtarget.h"
@@ -270,7 +268,7 @@ int Builder::main()
 				if(j->second->get_package()==i->second)
 				{
 					++count;
-					if(j->second->get_rebuild())
+					if(j->second->needs_rebuild())
 						++to_be_built;
 				}
 			if(count)
@@ -507,21 +505,12 @@ int Builder::create_targets()
 		if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
 		{
 			PkgConfig *pc = new PkgConfig(*this, *spkg);
-			install->add_depend(new Install(*this, *spkg, *pc));
+			install->add_depend(new InstalledFile(*this, *spkg, *pc));
 		}
 	}
 
-	// Find dependencies until no new targets are created
-	while(!new_tgts.empty())
-	{
-		Target *tgt = new_tgts.front();
-		new_tgts.erase(new_tgts.begin());
-		tgt->find_depends();
-		if(!tgt->get_depends_ready())
-			new_tgts.push_back(tgt);
-	}
-
 	// Apply what-ifs
+	// XXX This does not currently work with targets found during dependency discovery
 	for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
 		FileTarget *tgt = vfs.get_target(cwd/ *i);
@@ -566,7 +555,7 @@ int Builder::do_build()
 
 	unsigned total = 0;
 	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && i->second->get_rebuild())
+		if(i->second->is_buildable() && i->second->needs_rebuild())
 			++total;
 
 	if(!total)
@@ -592,7 +581,7 @@ int Builder::do_build()
 			if(tgt)
 			{
 				if(tgt->get_tool())
-					IO::print("[%-10s] [%-4s] %s\n", tgt->get_package()->get_name(), tgt->get_tool()->get_tag(), tgt->get_name());
+					IO::print("%-4s  %s\n", tgt->get_tool()->get_tag(), tgt->get_name());
 				Task *task = tgt->build();
 				if(task)
 					tasks.push_back(task);
@@ -659,7 +648,8 @@ int Builder::do_clean()
 
 	for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
 		if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
-			unlink(ft->get_path());
+			if(ft->get_mtime())
+				FS::unlink(ft->get_path());
 
 	return 0;
 }