Deprecate the install_headers statement

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ef0e60cbb7b2a3373dea85d6da7e50a5426ac6bd..432575f400db29633003b115013d78e361adaaa0 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -16,10 +16,7 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-/**
-Creates a buildable package.
-*/
-SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
        Package(b, n),
        source(s),
        config(*this),
@@ -28,36 +25,33 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const Path &s):
        tar_files.push_back(source/"Build");
 }
 
-Msp::Path SourcePackage::get_temp_dir() const
+Msp::FS::Path SourcePackage::get_temp_dir() const
 {
        return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
 }
 
-Msp::Path SourcePackage::get_out_dir() const
+Msp::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 +69,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();
@@ -131,9 +119,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");
@@ -156,10 +141,6 @@ void SourcePackage::init_config()
        }
 }
 
-/**
-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)
@@ -172,22 +153,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());
+       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(builder.get_prefix())/"include").str());
+               export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
        if(flags&LIB)
-               export_binfo.libpath.push_back((Path(builder.get_prefix())/"lib").str());
+               export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
        string optimize=config.get_option("optimize").value;
        if(lexical_cast<unsigned>(optimize))