Don't append library version to the end of the filename on Windows

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 095228b3b397c86434539e98c51cdc23ba4ef4e0..64e1115adbd7bdc43134c3ef185764f944a40848 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -3,7 +3,7 @@
 #include <msp/strings/format.h>
 #include "builder.h"
 #include "filetarget.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 #include "task.h"
 #include "tool.h"
@@ -22,6 +22,15 @@ Target::Target(Builder &b, const string &n):
        builder.add_target(this);
 }
 
+void Target::add_dependency(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()
@@ -75,11 +88,11 @@ void Target::prepare()
        }
 
        state = PREPARING;
-       find_depends();
+       find_dependencies();
        if(tool)
        {
                if(FileTarget *tool_exe = tool->get_executable())
-                       add_depend(tool_exe);
+                       add_dependency(*tool_exe);
        }
 
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -97,15 +110,11 @@ Task *Target::build()
 {
        if(!tool)
        {
+               // This special case is needed for VirtualTargets
                state = UPTODATE;
                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;
@@ -113,20 +122,9 @@ 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*/)
+void Target::build_finished(bool success)
 {
        state = UPTODATE;
+       if(success)
+               modified();
 }