Reorder class members

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index f17b88e103c6a8a3725d079ecaf046339b1c0824..b24013aaf55eabb094c72ef912480a956c6a9ae8 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,11 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  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"
@@ -16,11 +17,24 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-/**
-Tries to locate a target that will help getting this target built.  If all
-dependencies are up-to-date, returns this target.  If there are no targets
-ready to be built (maybe because they are being built right now), returns 0.
-*/
+Target::Target(Builder &b, const Package *p, const string &n):
+       builder(b),
+       package(p),
+       name(n),
+       buildable(false),
+       building(false),
+       rebuild(false),
+       deps_ready(false),
+       prepared(false),
+       counted(false)
+{
+       builder.add_target(this);
+
+       struct stat st;
+       if(!FS::stat(name, st))
+               mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
+}
+
 Target *Target::get_buildable_target()
 {
        if(!rebuild)
@@ -50,11 +64,6 @@ void Target::add_depend(Target *dep)
        dep->rdepends.push_back(this);
 }
 
-/**
-Prepares the target by recursively preparing dependencies, then checking
-whether rebuilding is needed.  A flag is used to prevent unnecessary
-executions.
-*/
 void Target::prepare()
 {
        if(prepared)
@@ -76,8 +85,8 @@ Action *Target::build()
                return 0;
        }
 
-       if(!builder.get_dry_run() && exists(name))
-               unlink(name);
+       if(!builder.get_dry_run() && FS::exists(name))
+               FS::unlink(name);
 
        Action *action=create_action();
        if(action)
@@ -90,10 +99,6 @@ Action *Target::build()
        return action;
 }
 
-/**
-Returns the number of targets that need to be rebuilt in order to get this
-target up-to-date.
-*/
 unsigned Target::count_rebuild()
 {
        if(counted)
@@ -106,41 +111,17 @@ unsigned Target::count_rebuild()
        return count;
 }
 
-/**
-Changes the mtime of the target to the current time.
-*/
 void Target::touch()
 {
        mtime=Time::now();
 }
 
-Target::Target(Builder &b, const Package *p, const string &n):
-       builder(b),
-       package(p),
-       name(n),
-       buildable(false),
-       building(false),
-       rebuild(false),
-       deps_ready(false),
-       prepared(false),
-       counted(false)
-{
-       builder.add_target(this);
-
-       struct stat st;
-       if(!stat(name, st))
-               mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
-}
-
 void Target::mark_rebuild(const std::string &reason)
 {
        rebuild=true;
        rebuild_reason=reason;
 }
 
-/**
-Checks if this target needs to be rebuilt and why.
-*/
 void Target::check_rebuild()
 {
        if(!buildable)
@@ -155,9 +136,9 @@ void Target::check_rebuild()
                for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
                {
                        if((*i)->get_mtime()>mtime)
-                               mark_rebuild(basename((*i)->get_name())+" has changed");
+                               mark_rebuild(FS::basename((*i)->get_name())+" has changed");
                        else if((*i)->get_rebuild())
-                               mark_rebuild(basename((*i)->get_name())+" needs rebuilding");
+                               mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
                }
        }
 
@@ -166,9 +147,6 @@ void Target::check_rebuild()
                mark_rebuild("Package options changed");
 }
 
-/**
-Handles for the build_done signal of Action.
-*/
 void Target::build_done()
 {
        building=false;