Adjust option help texts

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 577438b3528dce736aa3c22077e0857a24f5a0b4..cf4fae93d2aa3c851ea54627f4ec124fd3864ac4 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -22,6 +22,15 @@ Target::Target(Builder &b, const string &n):
        builder.add_target(this);
 }
 
+void Target::add_depend(Target &dep)
+{
+       if(&dep==this)
+               throw invalid_argument("Target::add_depend");
+       depends.push_back(&dep);
+       if(state>PREPARING)
+               dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+}
+
 Target *Target::get_buildable_target()
 {
        if(!needs_rebuild())
@@ -55,13 +64,17 @@ void Target::force_rebuild()
        mark_rebuild("Forced rebuild");
 }
 
-void Target::add_depend(Target &dep)
+void Target::mark_rebuild(const string &reason)
 {
-       if(&dep==this)
-               throw invalid_argument("Target::add_depend");
-       depends.push_back(&dep);
-       if(state>PREPARING)
-               dep.signal_bubble_rebuild.connect(sigc::mem_fun(this, &Target::check_rebuild));
+       if(reason.empty())
+               throw invalid_argument("No reason given for rebuilding "+name);
+
+       state = REBUILD;
+       rebuild_reason = reason;
+
+       builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
+
+       signal_bubble_rebuild.emit();
 }
 
 void Target::prepare()
@@ -102,11 +115,6 @@ Task *Target::build()
                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());
-
        Task *task = tool->run(*this);
        task->signal_finished.connect(sigc::mem_fun(this, &Target::build_finished));
        state = BUILDING;
@@ -114,19 +122,6 @@ Task *Target::build()
        return task;
 }
 
-void Target::mark_rebuild(const string &reason)
-{
-       if(reason.empty())
-               throw invalid_argument("No reason given for rebuilding "+name);
-
-       state = REBUILD;
-       rebuild_reason = reason;
-
-       builder.get_logger().log("rebuild", format("Rebuilding %s: %s", name, reason));
-
-       signal_bubble_rebuild.emit();
-}
-
 void Target::build_finished(bool /*success*/)
 {
        state = UPTODATE;