Make the name of a FileTarget be its basename instead of full path

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 38eaab59708440fb3d70bd3761ac4e793e53f321..532901167b51f813228a972a52e7b4941806b64f 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -26,25 +26,23 @@ Target::Target(Builder &b, const Package *p, const string &n):
        building(false),
        rebuild(false),
        deps_ready(false),
-       prepared(false),
-       counted(false)
-{
-       builder.add_target(this);
-}
+       preparing(false),
+       prepared(false)
+{ }
 
 Target *Target::get_buildable_target()
 {
        if(!rebuild)
                return 0;
 
-       bool self_ok=!building;
+       bool self_ok = !building;
        for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
-               Target *tgt=(*i)->get_buildable_target();
+               Target *tgt = (*i)->get_buildable_target();
                if(tgt)
                        return tgt;
                else if((*i)->get_rebuild())
-                       self_ok=false;
+                       self_ok = false;
        }
 
        if(self_ok)
@@ -65,59 +63,53 @@ 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;
 }
 
 Action *Target::build()
 {
        if(!buildable)
        {
-               rebuild=false;
+               rebuild = false;
                return 0;
        }
 
-       if(FileTarget *ft=dynamic_cast<FileTarget *>(this))
+       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();
+       Action *action = create_action();
        if(action)
        {
                action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
 
-               building=true;
+               building = true;
        }
 
        return action;
 }
 
-unsigned Target::count_rebuild()
-{
-       if(counted)
-               return 0;
-
-       counted=true;
-       unsigned count=rebuild;
-       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
-               count+=(*i)->count_rebuild();
-       return count;
-}
-
 void Target::touch()
 {
-       mtime=Time::now();
+       mtime = Time::now();
 }
 
 void Target::mark_rebuild(const std::string &reason)
 {
-       rebuild=true;
-       rebuild_reason=reason;
+       rebuild = true;
+       rebuild_reason = reason;
 }
 
 void Target::check_rebuild()
@@ -134,19 +126,19 @@ void Target::check_rebuild()
                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");
+                               mark_rebuild((*i)->get_name()+" has changed");
                        else if((*i)->get_rebuild())
-                               mark_rebuild(FS::basename((*i)->get_name())+" needs rebuilding");
+                               mark_rebuild((*i)->get_name()+" needs rebuilding");
                }
        }
 
-       const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+       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()
 {
-       building=false;
-       rebuild=false;
+       building = false;
+       rebuild = false;
 }