Move C-specific stuff from SourceFile to CSourceFile

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 3ee6bc5efe1528fc5573ed0ea8e8a9fc23107c93..adde0cd180727b8ceb0a18d46455c60e3cf1f244 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,19 +1,11 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/time/utils.h>
-#include "action.h"
 #include "builder.h"
 #include "filetarget.h"
 #include "package.h"
-#include "sourcepackage.h"
 #include "target.h"
+#include "task.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -22,7 +14,7 @@ Target::Target(Builder &b, const Package *p, const string &n):
        builder(b),
        package(p),
        name(n),
-       buildable(false),
+       tool(0),
        building(false),
        rebuild(false),
        deps_ready(false),
@@ -38,7 +30,7 @@ Target *Target::get_buildable_target()
                return 0;
 
        bool self_ok = !building;
-       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt = (*i)->get_buildable_target();
                if(tgt)
@@ -53,12 +45,16 @@ Target *Target::get_buildable_target()
        return 0;
 }
 
+void Target::set_tool(const Tool &t)
+{
+       tool = &t;
+}
+
 void Target::add_depend(Target *dep)
 {
        if(dep==this)
-               throw InvalidParameterValue("A target can't depend on itself");
+               throw invalid_argument("Target::add_depend");
        depends.push_back(dep);
-       dep->rdepends.push_back(this);
 }
 
 void Target::prepare()
@@ -72,7 +68,7 @@ void Target::prepare()
        }
 
        preparing = true;
-       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
 
        check_rebuild();
@@ -80,32 +76,24 @@ void Target::prepare()
        prepared = true;
 }
 
-Action *Target::build()
+Task *Target::build()
 {
-       if(!buildable)
+       if(!tool)
        {
                rebuild = false;
                return 0;
        }
 
+       // XXX Minor breach of OO here
        if(FileTarget *ft = dynamic_cast<FileTarget *>(this))
                if(!builder.get_dry_run() && FS::exists(ft->get_path()))
                        FS::unlink(ft->get_path());
 
-       Action *action = create_action();
-       if(action)
-       {
-               action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-
-               building = true;
-       }
+       Task *task = tool->run(*this);
+       task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
+       building = true;
 
-       return action;
-}
-
-void Target::touch()
-{
-       mtime = Time::now();
+       return task;
 }
 
 void Target::mark_rebuild(const std::string &reason)
@@ -114,32 +102,7 @@ void Target::mark_rebuild(const std::string &reason)
        rebuild_reason = reason;
 }
 
-void Target::check_rebuild()
-{
-       if(!buildable)
-               return;
-
-       if(builder.get_build_all())
-               mark_rebuild("Rebuilding everything");
-       else if(!mtime)
-               mark_rebuild("Does not exist");
-       else
-       {
-               for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
-               {
-                       if((*i)->get_mtime()>mtime)
-                               mark_rebuild(FS::basename((*i)->get_name())+" has changed");
-                       else if((*i)->get_rebuild())
-                               mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
-               }
-       }
-
-       const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
-               mark_rebuild("Package options changed");
-}
-
-void Target::build_done()
+void Target::build_finished(bool /*success*/)
 {
        building = false;
        rebuild = false;