/* $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"
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;
}
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();
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();
}
{
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;
}
deps_cache.load();
-
- /*for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- (*i)->configure(opts, flag&2);*/
}
-/**
-Initializes configuration options.
-*/
void SourcePackage::init_config()
{
config.add_option("profile", "default", "Configuration profile");
config.add_option("optimize", "0", "Apply compiler optimizations");
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("cpu", "none", "CPU type to optimize for");
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);
{
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)
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))
build_info.cflags.push_back("-O"+optimize);
build_info.ldflags.push_back("-O"+optimize);
string cpu=config.get_option("cpu").value;
- if(cpu!="auto")
+ if(cpu!="none")
build_info.cflags.push_back("-march="+cpu);
}
add("build_info", &Loader::build_info);
add("feature", &Loader::feature);
add("if", &Loader::condition);
- add("program", &Loader::program);
- add("library", &Loader::library);
- add("module", &Loader::module);
- add("headers", &Loader::headers);
+ add("program", &Loader::component<Component::PROGRAM>);
+ add("library", &Loader::component<Component::LIBRARY>);
+ add("module", &Loader::component<Component::MODULE>);
+ add("headers", &Loader::component<Component::HEADERS>);
+ add("install", &Loader::component<Component::INSTALL>);
+ 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));
spkg.conditions.push_back(cond);
}
-void SourcePackage::Loader::program(const string &n)
-{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
- Component prog(spkg, Component::PROGRAM, n);
- load_sub(prog);
- spkg.components.push_back(prog);
-}
-
-void SourcePackage::Loader::library(const string &n)
+template<Component::Type t>
+void SourcePackage::Loader::component(const string &n)
{
SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
- Component prog(spkg, Component::LIBRARY, n);
- load_sub(prog);
- spkg.components.push_back(prog);
+ Component comp(spkg, t, n);
+ load_sub(comp);
+ spkg.components.push_back(comp);
}
-void SourcePackage::Loader::module(const string &n)
+void SourcePackage::Loader::build_info()
{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
- Component prog(spkg, Component::MODULE, n);
- load_sub(prog);
- spkg.components.push_back(prog);
+ load_sub(static_cast<SourcePackage &>(pkg).build_info);
}
-void SourcePackage::Loader::headers(const string &n)
+void SourcePackage::Loader::tarball(const string &n)
{
SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
- Component prog(spkg, Component::HEADERS, n);
- load_sub(prog);
- spkg.components.push_back(prog);
-}
-
-void SourcePackage::Loader::build_info()
-{
- load_sub(static_cast<SourcePackage &>(pkg).build_info);
+ 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);
}
projects / builder.git / blobdiff