X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=d8142038d1e65756f5ad7ccae68f693dc86bf525;hb=7567502e17be7704d58ced2f49703fcf71c7ef38;hp=aaea4e68c3002428bfd937778a7e694f601bcaf9;hpb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index aaea4e6..d814203 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -19,7 +19,7 @@ using namespace Msp;
 /**
 Creates a buildable package.
 */
-SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
 	Package(b, n),
 	source(s),
 	config(*this),
@@ -28,12 +28,12 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s):
 	tar_files.push_back(source/"Build");
 }
 
-Msp::Path::Path SourcePackage::get_temp_dir() const
+Msp::Path SourcePackage::get_temp_dir() const
 {
-	return source/config.get_option("tempdir").value/config.get_option("profile").value;
+	return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
 }
 
-Msp::Path::Path SourcePackage::get_out_dir() const
+Msp::Path SourcePackage::get_out_dir() const
 {
 	return source/config.get_option("outdir").value;
 }
@@ -106,7 +106,8 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 		{
 			const StringList &reqs=i->get_requires();
 			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-				requires.push_back(builder.get_package(*j));
+				if(Package *pkg=builder.get_package(*j))
+					requires.push_back(pkg);
 		}
 
 	base_reqs=requires;
@@ -142,21 +143,8 @@ void SourcePackage::init_config()
 	config.add_option("strip",      "0",       "Strip symbols from programs");
 	config.add_option("debug",      "0",       "Produce debugging symbols");
 	config.add_option("cpu",        "auto",    "CPU type to optimize for");
-	config.add_option("arch",       "native",  "Architecture for cross-compiling");
 	config.add_option("staticlibs", "local",   "Use static libraries");
 
-	unsigned flags=get_install_flags();
-	if(flags)
-		config.add_option("prefix",     "$HOME/local",     "Installation prefix");
-	/*if(flags&INCLUDE)
-		config.add_option("includedir", "$prefix/include", "Header installation directory");
-	if(flags&BIN)
-		config.add_option("includedir", "$prefix/bin",     "Binary installation directory");
-	if(flags&LIB)
-		config.add_option("includedir", "$prefix/lib",     "Library installation directory");
-	if(flags&DATA)
-		config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
-
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		config.add_option("with_"+i->name, "0", i->descr);
 
@@ -164,7 +152,7 @@ void SourcePackage::init_config()
 	{
 		BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
 		if(bpkg && bpkg->get_need_path())
-			config.add_option(bpkg->get_name()+"_path", "", "Path for "+bpkg->get_name());
+			config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
 	}
 }
 
@@ -184,19 +172,19 @@ void SourcePackage::create_build_info()
 		export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
 	}
 
-	build_info.cflags.push_back("-Wall");
-	build_info.cflags.push_back("-Wshadow");
-	build_info.cflags.push_back("-Wextra");
-	build_info.cflags.push_back("-Wpointer-arith");
-	build_info.cflags.push_back("-Wconversion");
-	build_info.cflags.push_back("-Werror");
+	// 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((Path(builder.get_prefix())/"include").str());
+	build_info.libpath.push_back((Path(builder.get_prefix())/"lib").str());
+
 	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
+		export_binfo.incpath.push_back((Path(builder.get_prefix())/"include").str());
 	if(flags&LIB)
-		export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+		export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str());
 
 	string optimize=config.get_option("optimize").value;
 	if(lexical_cast<unsigned>(optimize))
@@ -218,6 +206,10 @@ void SourcePackage::create_build_info()
 		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
 			build_info.cflags.push_back("-DWITH_"+toupper(i->name));
 
+	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
+		if(i->eval())
+			build_info.add(i->get_build_info());
+
 	build_info.unique();
 
 	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)