Split class Package into SourcePackage and BinaryPackage

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index 1f4ace9d92c1d7b79122129a99b9781814e0f0d5..fa63ac4e5154293050db87c91168d4c286690938 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -1,8 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include <msp/time/utils.h>
 #include "action.h"
 #include "builder.h"
 #include "package.h"
+#include "sourcepackage.h"
 #include "target.h"
 
 using namespace std;
@@ -15,7 +23,10 @@ ready to be built (maybe because they are being built right now), returns 0.
 */
 Target *Target::get_buildable_target()
 {
-       bool self_ok=true;
+       if(!rebuild)
+               return 0;
+
+       bool self_ok=!building;
        for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt=(*i)->get_buildable_target();
@@ -25,7 +36,7 @@ Target *Target::get_buildable_target()
                        self_ok=false;
        }
 
-       if(self_ok && rebuild && !building)
+       if(self_ok)
                return this;
 
        return 0;
@@ -33,6 +44,8 @@ Target *Target::get_buildable_target()
 
 void Target::add_depend(Target *dep)
 {
+       if(dep==this)
+               throw InvalidParameterValue("A target can't depend on itself");
        depends.push_back(dep);
        dep->rdepends.push_back(this);
 }
@@ -90,6 +103,8 @@ Target::Target(Builder &b, const Package *p, const string &n):
        prepared(false),
        counted(false)
 {
+       builder.add_target(this);
+
        struct stat st;
        if(!Path::stat(name, st))
                mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
@@ -123,7 +138,9 @@ void Target::check_rebuild()
                                mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
                }
        }
-       if(!rebuild && package && package->get_config().get_mtime()>mtime)
+
+       const SourcePackage *spkg=dynamic_cast<const SourcePackage *>(package);
+       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
                mark_rebuild("Package options changed");
 }