X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=6626db8ded177b79ed8ecd1f0b8bd5a81f3bf456;hb=f75a99316e896cf1e424a489ce360a67844d86b0;hp=2a60c2986bac2ec89f1454995f89283fe5d973da;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git diff --git a/source/filetarget.cpp b/source/filetarget.cpp index 2a60c29..6626db8 100644 --- a/source/filetarget.cpp +++ b/source/filetarget.cpp @@ -10,7 +10,7 @@ using namespace std; using namespace Msp; FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a): - Target(b, make_name(p, a)), + Target(b, generate_name(p, a)), path(a), size(0) { @@ -28,6 +28,7 @@ FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a): void FileTarget::touch() { mtime = Time::now(); + signal_bubble_rebuild.emit(); } void FileTarget::check_rebuild() @@ -35,9 +36,7 @@ void FileTarget::check_rebuild() if(!tool) return; - if(builder.get_build_all()) - mark_rebuild("Rebuilding everything"); - else if(!mtime) + if(!mtime) mark_rebuild("Does not exist"); else { @@ -48,12 +47,6 @@ void FileTarget::check_rebuild() mark_rebuild((*i)->get_name()+" has changed"); else if((*i)->needs_rebuild()) mark_rebuild((*i)->get_name()+" needs rebuilding"); - else - { - Target *real = ft->get_real_target(); - if(real->needs_rebuild()) - mark_rebuild(real->get_name()+" needs rebuilding"); - } } } @@ -62,7 +55,7 @@ void FileTarget::check_rebuild() mark_rebuild("Package options changed"); } -string FileTarget::make_name(const Package *pkg, const FS::Path &pth) +string FileTarget::generate_name(const Package *pkg, const FS::Path &pth) { if(const SourcePackage *spkg = dynamic_cast(pkg)) {