Put output files for foreign archs in their own directories

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ef4fd5760a26fd1a90f7fb077d3256612c4b9fca..9da79739d56854130f42d5fdbf58963557fa9450 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -19,7 +19,7 @@ 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,14 +28,18 @@ 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/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 SourcePackage::get_out_dir() const
+Msp::FS::Path SourcePackage::get_out_dir() const
 {
-       return source/config.get_option("outdir").value;
+       const std::string &arch_name=builder.get_current_arch().get_name();
+       if(arch_name=="native")
+               return source/config.get_option("outdir").value;
+       else
+               return source/arch_name/config.get_option("outdir").value;
 }
 
 /**
@@ -143,21 +147,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);
 
@@ -185,19 +176,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(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(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))