Always prepare cmdline to avoid some dependency hassle

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index c9c23ad9116165297d602978b9be04c13f902530..2005d25cfc55817792d47289a2c1c2dabb58ce9d 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,25 +1,37 @@
 /* $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"
+#include "filetarget.h"
 #include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 
 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),
+       preparing(false),
+       prepared(false)
+{
+       builder.add_target(this);
+}
+
 Target *Target::get_buildable_target()
 {
        if(!rebuild)
@@ -49,75 +61,59 @@ 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)
                return;
+       if(preparing)
+       {
+               builder.problem((package ? package->get_name() : string()), "Dependency cycle detected at "+name);
+               return;
+       }
 
-       prepared=true;
+       preparing=true;
        for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
 
        check_rebuild();
-
+       preparing=false;
+       prepared=true;
 }
 
-/**
-Returns the number of targets that need to be rebuilt in order to get this
-target up-to-date.
-*/
-unsigned Target::count_rebuild()
+Action *Target::build()
 {
-       if(counted)
+       if(!buildable)
+       {
+               rebuild=false;
                return 0;
+       }
 
-       counted=true;
-       unsigned count=rebuild;
-       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
-               count+=(*i)->count_rebuild();
-       return count;
+       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;
+       }
+
+       return action;
 }
 
-/**
-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(!Path::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)
@@ -132,29 +128,17 @@ 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");
                }
        }
-       if(!rebuild && package && package->get_config().get_mtime()>mtime)
-               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;
+       const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+               mark_rebuild("Package options changed");
 }
 
-/**
-Handles for the build_done signal of Action.
-*/
 void Target::build_done()
 {
        building=false;