Use mspio for all I/O operations

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 9da79739d56854130f42d5fdbf58963557fa9450..3f38acf39c1eba37024d751ef840543195d2ee1d 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,9 +16,6 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-/**
-Creates a buildable package.
-*/
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
        Package(b, n),
        source(s),
@@ -35,33 +32,26 @@ Msp::FS::Path SourcePackage::get_temp_dir() const
 
 Msp::FS::Path SourcePackage::get_out_dir() const
 {
-       const std::string &arch_name=builder.get_current_arch().get_name();
-       if(arch_name=="native")
+       const Architecture &arch=builder.get_current_arch();
+       if(arch.is_native())
                return source/config.get_option("outdir").value;
        else
-               return source/arch_name/config.get_option("outdir").value;
+               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;
 }
@@ -79,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();
@@ -98,7 +82,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();
        }
@@ -135,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");
@@ -160,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)