Track build options to rebuild primary targets when build type changes

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 7de9b797761717ce968649931e29ea6a32b8920c..1f25cd1a9818a283c9e74ba4705d3df2dafd9faa 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,10 +1,12 @@
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "filetarget.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -84,8 +86,27 @@ void FileTarget::check_rebuild()
                }
        }
 
-       if(!needs_rebuild() && package && package->get_config().get_mtime()>mtime)
-               mark_rebuild("Package options changed");
+       if(!needs_rebuild() && package)
+       {
+               if(package->get_config().get_mtime()>mtime)
+                       mark_rebuild("Package options changed");
+
+               string build_sig = create_build_signature();
+               if(package->get_cache().has_key(this, "build_sig"))
+               {
+                       if(package->get_cache().get_value(this, "build_sig")!=build_sig)
+                               mark_rebuild("Build signature changed");
+               }
+       }
+}
+
+string FileTarget::create_build_signature() const
+{
+       if(!package)
+               return string();
+
+       const BuildInfo &binfo = (component ? component->get_build_info() : package->get_build_info());
+       return tool->create_build_signature(binfo);
 }
 
 Task *FileTarget::build()
@@ -99,7 +120,15 @@ Task *FileTarget::build()
 void FileTarget::build_finished(bool success)
 {
        if(success)
+       {
                stat();
+               if(package)
+               {
+                       string build_sig = create_build_signature();
+                       if(!build_sig.empty())
+                               package->get_cache().set_value(this, "build_sig", build_sig);
+               }
+       }
 
        Target::build_finished(success);
 }