Migrate from msppath to mspfs

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index fa63ac4e5154293050db87c91168d4c286690938..07620502f4be2cbe21eafde8b5dab5de870d9668 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/time/utils.h>
 #include "action.h"
 #include "builder.h"
@@ -68,6 +69,28 @@ void Target::prepare()
 
 }
 
+Action *Target::build()
+{
+       if(!buildable)
+       {
+               rebuild=false;
+               return 0;
+       }
+
+       if(!builder.get_dry_run() && FS::exists(name))
+               FS::unlink(name);
+
+       Action *action=create_action();
+       if(action)
+       {
+               action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
+
+               building=true;
+       }
+
+       return action;
+}
+
 /**
 Returns the number of targets that need to be rebuilt in order to get this
 target up-to-date.
@@ -106,7 +129,7 @@ Target::Target(Builder &b, const Package *p, const string &n):
        builder.add_target(this);
 
        struct stat st;
-       if(!Path::stat(name, st))
+       if(!FS::stat(name, st))
                mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 }
 
@@ -133,9 +156,9 @@ void Target::check_rebuild()
                for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
                {
                        if((*i)->get_mtime()>mtime)
-                               mark_rebuild(Path::basename((*i)->get_name())+" has changed");
+                               mark_rebuild(FS::basename((*i)->get_name())+" has changed");
                        else if((*i)->get_rebuild())
-                               mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
+                               mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
                }
        }
 
@@ -144,17 +167,6 @@ void Target::check_rebuild()
                mark_rebuild("Package options changed");
 }
 
-/**
-Hooks the target up with the given action, then returns it.  This should be
-called from the public build() function of buildable targets.
-*/
-Action *Target::build(Action *action)
-{
-       building=true;
-       action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-       return action;
-}
-
 /**
 Handles for the build_done signal of Action.
 */