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

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index aaea4e6..751f1b2 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,11 +1,11 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
+#include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "binarypackage.h"
@@ -16,48 +16,50 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-/**
-Creates a buildable package.
-*/
-SourcePackage::SourcePackage(Builder &b, const string &n, const Path::Path &s):
+namespace {
+
+bool component_sort(const Component &c1, const Component &c2)
+{ return c1.get_type()<c2.get_type(); }
+
+}
+
+
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
 	source(s),
 	config(*this),
 	deps_cache(*this)
 {
-	tar_files.push_back(source/"Build");
+	components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
-Msp::Path::Path SourcePackage::get_temp_dir() const
+FS::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
+FS::Path SourcePackage::get_out_dir() const
 {
-	return source/config.get_option("outdir").value;
+	const Architecture &arch=builder.get_current_arch();
+	if(arch.is_native())
+		return source/config.get_option("outdir").value;
+	else
+		return source/arch.get_name()/config.get_option("outdir").value;
 }
 
-/**
-Checks which kinds of things the components of this package install.
-
-@return  A bitmask of installed things
-*/
 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;
+			else if(i->get_type()==Component::HEADERS)
+				flags|=INCLUDE;
 		}
-		if(!i->get_install_headers().empty())
-			flags|=INCLUDE;
-	}
 
 	return flags;
 }
@@ -75,12 +77,6 @@ LibMode SourcePackage::get_library_mode() const
 		throw Exception("Unknown library mode");
 }
 
-/*** private ***/
-
-/**
-Processes configuration options that were most likely obtained from the command
-line.
-*/
 void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 {
 	init_config();
@@ -94,7 +90,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 	if(flag && config.update(opts))
 	{
 		if(builder.get_verbose()>=2)
-			cout<<"Configuration of "<<name<<" changed\n";
+			IO::print("Configuration of %s changed\n", name);
 		if(!builder.get_dry_run())
 			config.save();
 	}
@@ -106,7 +102,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;
@@ -130,9 +127,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 		(*i)->configure(opts, flag&2);*/
 }
 
-/**
-Initializes configuration options.
-*/
 void SourcePackage::init_config()
 {
 	config.add_option("profile",    "default", "Configuration profile");
@@ -142,21 +136,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,14 +145,10 @@ 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());
 	}
 }
 
-/**
-Fills in build info based on configuration.  All required packages must be
-configured when this is called.
-*/
 void SourcePackage::create_build_info()
 {
 	for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i)
@@ -184,19 +161,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((builder.get_prefix()/"include").str());
+	build_info.libpath.push_back((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((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((builder.get_prefix()/"lib").str());
 
 	string optimize=config.get_option("optimize").value;
 	if(lexical_cast<unsigned>(optimize))
@@ -218,6 +195,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)
@@ -243,9 +224,16 @@ SourcePackage::Loader::Loader(Package &p):
 	add("library",     &Loader::library);
 	add("module",      &Loader::module);
 	add("headers",     &Loader::headers);
+	add("tarball",     &Loader::tarball);
 	add("tar_file",    &Loader::tar_file);
 }
 
+void SourcePackage::Loader::finish()
+{
+	SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+	spkg.components.sort(component_sort);
+}
+
 void SourcePackage::Loader::feature(const string &n, const string &d)
 {
 	static_cast<SourcePackage &>(pkg).features.push_back(Feature(n, d));
@@ -296,8 +284,27 @@ void SourcePackage::Loader::build_info()
 	load_sub(static_cast<SourcePackage &>(pkg).build_info);
 }
 
+void SourcePackage::Loader::tarball(const string &n)
+{
+	SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+	if(n=="@src")
+	{
+		for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+			if(i->get_type()==Component::TARBALL && i->get_name()==n)
+				load_sub(*i);
+	}
+	else
+	{
+		Component trbl(spkg, Component::TARBALL, n);
+		load_sub(trbl);
+	}
+}
+
 void SourcePackage::Loader::tar_file(const string &f)
 {
+	IO::print("%s: Note: tar_file is deprecated\n", get_source());
 	SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
-	spkg.tar_files.push_back(spkg.source/f);
+	for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+		if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
+			const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);
 }