X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=1de15ef86781ae2696fa114eb7b3c8c0d6e344ef;hb=4699c9eb82fb55268976fda87f1f4bf5f7df95a4;hp=63f3bba5848c47c4bbaa6c534dd3bb7e9a41d4ab;hpb=c51884994862b02613c2c0ae75b1f8d39e0f1ee5;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 63f3bba..1de15ef 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -23,40 +23,37 @@ bool component_sort(const Component &c1, const Component &c2)
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
 	source(s),
+	build_type(0),
 	config(*this),
 	deps_cache(*this)
 {
 	components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
+void SourcePackage::set_build_type(const BuildType &t)
+{
+	build_type = &t;
+}
+
 FS::Path SourcePackage::get_temp_dir() const
 {
-	string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+	string subdir = builder.get_current_arch().get_name();
+	if(build_type)
+	{
+		subdir += '.';
+		subdir += build_type->get_name();
+	}
 	return source/config.get_option("tempdir").value/subdir;
 }
 
 FS::Path SourcePackage::get_out_dir() const
 {
 	const Architecture &arch = builder.get_current_arch();
+	string detail = (build_type ? build_type->get_name() : string());
 	if(arch.is_native())
-		return source/config.get_option("outdir").value;
+		return source/detail;
 	else
-		return source/arch.get_name()/config.get_option("outdir").value;
-}
-
-unsigned SourcePackage::get_install_flags()
-{
-	unsigned flags = 0;
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		if(i->get_install())
-		{
-			if(i->get_type()==Component::PROGRAM)
-				flags |= BIN;
-			else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-				flags |= LIB|INCLUDE;
-		}
-
-	return flags;
+		return source/arch.get_name()/detail;
 }
 
 LibMode SourcePackage::get_library_mode() const
@@ -120,18 +117,10 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 {
 	init_config();
 
-	StringMap::const_iterator prof = opts.find("profile");
-	if(prof!=opts.end() && flag)
-		config.select_profile(prof->second);
-	else
-		config.select_last_profile();
+	config.load();
 
 	if(flag && config.update(opts))
-	{
 		builder.get_logger().log("configure", format("Configuration of %s changed", name));
-		if(!builder.get_dry_run())
-			config.save();
-	}
 
 	config.finish();
 
@@ -159,12 +148,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 
 void SourcePackage::init_config()
 {
-	config.add_option("profile",    "default", "Configuration profile");
 	config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
-	config.add_option("outdir",     ".",       "Directory to put build results in");
-	config.add_option("optimize",   "0",       "Compiler optimization level");
-	config.add_option("strip",      "no",      "Strip symbols from programs");
-	config.add_option("debug",      "no",      "Produce debugging symbols");
 	config.add_option("staticlibs", "local",   "Use static libraries");
 
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
@@ -180,33 +164,24 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
+	if(build_type)
+		build_info.update_from(build_type->get_build_info());
+
 	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
 	const StringList &warnings = builder.get_warnings();
 	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
 
-	unsigned flags = get_install_flags();
-
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-	if(flags&LIB)
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
-
-	string optimize = config.get_option("optimize").value;
-	if(!optimize.empty() && optimize!="0")
-	{
-		if(optimize=="s" || optimize=="size")
-			build_info.optimize = -1;
-		else
-			build_info.optimize = lexical_cast<unsigned>(optimize);
-	}
+	bool export_paths = false;
+	for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
+		export_paths = (i->get_type()==Component::LIBRARY);
 
-	if(lexical_cast<bool>(config.get_option("debug").value))
+	if(export_paths)
 	{
-		build_info.debug = true;
-		build_info.defines["DEBUG"] = "1";
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 	}
 
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
@@ -238,10 +213,16 @@ void SourcePackage::create_targets()
 	if(pc_needed)
 	{
 		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
-		builder.get_target("install")->add_depend(builder.get_toolchain().get_tool("CP").create_target(*pc));
+		builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
 	}
 }
 
+void SourcePackage::save_caches()
+{
+	config.save();
+	deps_cache.save();
+}
+
 
 SourcePackage::Loader::Loader(SourcePackage &p):
 	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)