X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=44bf878b4efa1e1b24d4793b669a1b08e5b342dc;hb=0c83b922e56976a30506d9f8d43c9dcd38d573b5;hp=6835299b4ac464807240565fd231731d80b2edd0;hpb=782df8c2a38d9f88d30fecc525d72c45db8efa8e;p=builder.git

diff --git a/source/builder.h b/source/builder.h
index 6835299..44bf878 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BUILDER_H_
 #define BUILDER_H_
 
@@ -30,7 +23,7 @@ class VirtualTarget;
 /**
 The main application class.  Controls and owns everything.  Rules the world.
 */
-class Builder: public Msp::Application
+class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
 	class Loader: public Msp::DataFile::Loader
@@ -59,6 +52,10 @@ private:
 		void option(const std::string &, const std::string &);
 	};
 
+public:
+	typedef std::map<std::string, Target *> TargetMap;
+
+private:
 	typedef std::list<Package *> PackageList;
 	typedef std::map<std::string, Package *> PackageMap;
 	typedef std::map<std::string, StringMap> ProfileTemplateMap;
@@ -74,6 +71,7 @@ private:
 	bool no_externals;
 
 	TargetMap targets;
+	TargetMap targets_by_path;
 	TargetList new_tgts;
 	TargetMap includes;
 	TargetMap libraries;
@@ -101,7 +99,6 @@ private:
 	Msp::FS::Path prefix;
 	StringList warnings;
 
-	static Msp::Application::RegApp<Builder> reg;
 	static std::string usagemsg;
 	static std::string helpmsg;
 
@@ -125,6 +122,8 @@ public:
 	/** Looks up a target by name.  Returns 0 if no such target exists. */
 	Target *get_target(const std::string &) const;
 
+	FileTarget *get_target_by_path(const Msp::FS::Path &) const;
+
 	const TargetMap &get_targets() const { return targets; }
 
 	/** Tries to locate a header based on location of including file and include
@@ -149,8 +148,8 @@ public:
 
 	/** Adds a target to both the target map and the new target queue.  Called
 	from Target constructor. */
-	void add_target(FileTarget *);
-	void add_target(VirtualTarget *);
+	void add_target(Target *);
+	void register_path(const Msp::FS::Path &, FileTarget *);
 
 	void problem(const std::string &, const std::string &);