X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=813f8ed788deff1c85f8eca5810134e85f8cfb63;hb=7606161ee4a6fd13c2f5ddca413ba3582df66f03;hp=c61d4a77c71c8f98e53790cd4d95028ebb0cc378;hpb=0dea0d850f6690de07933794592916d11c9d3f49;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index c61d4a7..813f8ed 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -21,6 +21,7 @@
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
 #include "installedfile.h"
+#include "mingwdlltool.h"
 #include "package.h"
 #include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
@@ -34,7 +35,6 @@ using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
 	package_manager(*this),
-	main_pkg(0),
 	native_arch(*this, string()),
 	build_type(0),
 	vfs(*this),
@@ -203,6 +203,8 @@ Builder::Builder(int argc, char **argv):
 	toolchain.add_tool(new Copy(*this));
 	toolchain.add_tool(new Tar(*this));
 	toolchain.add_tool(new PkgConfigGenerator(*this));
+	if(current_arch->get_system()=="windows")
+		toolchain.add_tool(new MingwDllTool(*this, *current_arch));
 }
 
 Builder::~Builder()
@@ -341,9 +343,12 @@ void Builder::add_primary_target(Target &t)
 
 void Builder::add_installed_target(Target &t)
 {
-	Target *install = get_target("install");
-	const Tool &copy = toolchain.get_tool("CP");
-	install->add_dependency(*copy.create_target(t));
+	Target *inst_tgt = 0;
+	if(const Tool *tool = t.get_tool())
+		inst_tgt = tool->create_install(t);
+	if(!inst_tgt)
+		inst_tgt = toolchain.get_tool("CP").create_target(t);
+	get_target("install")->add_dependency(*inst_tgt);
 }
 
 void Builder::usage(const char *reason, const char *argv0, bool brief)
@@ -386,7 +391,7 @@ bool Builder::prepare_build()
 	Target *tarballs = new VirtualTarget(*this, "tarballs");
 	world->add_dependency(*tarballs);
 
-	main_pkg->prepare();
+	package_manager.get_main_package().prepare();
 
 	// Make the cmdline target depend on all targets mentioned on the command line
 	Target *cmdline = new VirtualTarget(*this, "cmdline");
@@ -552,7 +557,7 @@ int Builder::do_clean()
 		Target *tgt = queue.front();
 		queue.erase(queue.begin());
 
-		if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
+		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || clean>=2))
 			clean_tgts.insert(tgt);
 
 		const Target::Dependencies &deps = tgt->get_dependencies();
@@ -573,11 +578,12 @@ int Builder::do_clean()
 
 void Builder::package_help()
 {
-	const Config &config = main_pkg->get_config();
+	SourcePackage &main_pkg = dynamic_cast<SourcePackage &>(package_manager.get_main_package());
+	const Config &config = main_pkg.get_config();
 	const Config::OptionMap &options = config.get_options();
 
 	IO::print("Required packages:\n  ");
-	const Package::Requirements &requires = main_pkg->get_required_packages();
+	const Package::Requirements &requires = main_pkg.get_required_packages();
 	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		if(i!=requires.begin())
@@ -638,10 +644,8 @@ void Builder::Loader::profile(const string &)
 void Builder::Loader::package(const string &n)
 {
 	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
-	if(!obj.main_pkg)
-		obj.main_pkg = pkg;
 
-	if(obj.conf_all || pkg==obj.main_pkg)
+	if(obj.conf_all || pkg==&obj.package_manager.get_main_package())
 		load_sub(*pkg, obj.cmdline_options);
 	else
 		load_sub(*pkg);