Miscellaneous minor code cleanups

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index d8142038d1e65756f5ad7ccae68f693dc86bf525..751f1b2c4dcfa4d15a157d7f20b9fdd4c1845cdc 100644 (file)
--- 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 &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 SourcePackage::get_temp_dir() const
+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
+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();
        }
@@ -131,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");
@@ -156,10 +149,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)
@@ -178,13 +167,13 @@ void SourcePackage::create_build_info()
 
        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))
@@ -235,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));
@@ -288,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);
 }