Replace the overly generic configuration profiles with something more purposeful

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 02e9152a7b3ef52abcf5042bcf41d56516b7ac0a..1de15ef86781ae2696fa114eb7b3c8c0d6e344ef 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -23,25 +23,37 @@ bool component_sort(const Component &c1, const Component &c2)
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
        Package(b, n),
        source(s),
+       build_type(0),
        config(*this),
        deps_cache(*this)
 {
        components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
+void SourcePackage::set_build_type(const BuildType &t)
+{
+       build_type = &t;
+}
+
 FS::Path SourcePackage::get_temp_dir() const
 {
-       string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+       string subdir = builder.get_current_arch().get_name();
+       if(build_type)
+       {
+               subdir += '.';
+               subdir += build_type->get_name();
+       }
        return source/config.get_option("tempdir").value/subdir;
 }
 
 FS::Path SourcePackage::get_out_dir() const
 {
        const Architecture &arch = builder.get_current_arch();
+       string detail = (build_type ? build_type->get_name() : string());
        if(arch.is_native())
-               return source/config.get_option("outdir").value;
+               return source/detail;
        else
-               return source/arch.get_name()/config.get_option("outdir").value;
+               return source/arch.get_name()/detail;
 }
 
 LibMode SourcePackage::get_library_mode() const
@@ -105,11 +117,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 {
        init_config();
 
-       StringMap::const_iterator prof = opts.find("profile");
-       if(prof!=opts.end() && flag)
-               config.select_profile(prof->second);
-       else
-               config.select_last_profile();
+       config.load();
 
        if(flag && config.update(opts))
                builder.get_logger().log("configure", format("Configuration of %s changed", name));
@@ -140,12 +148,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 
 void SourcePackage::init_config()
 {
-       config.add_option("profile",    "default", "Configuration profile");
        config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
-       config.add_option("outdir",     ".",       "Directory to put build results in");
-       config.add_option("optimize",   "0",       "Compiler optimization level");
-       config.add_option("strip",      "no",      "Strip symbols from programs");
-       config.add_option("debug",      "no",      "Produce debugging symbols");
        config.add_option("staticlibs", "local",   "Use static libraries");
 
        for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
@@ -161,6 +164,9 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
+       if(build_type)
+               build_info.update_from(build_type->get_build_info());
+
        // 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());
@@ -178,21 +184,6 @@ void SourcePackage::create_build_info()
                export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
        }
 
-       string optimize = config.get_option("optimize").value;
-       if(!optimize.empty() && optimize!="0")
-       {
-               if(optimize=="s" || optimize=="size")
-                       build_info.optimize = -1;
-               else
-                       build_info.optimize = lexical_cast<unsigned>(optimize);
-       }
-
-       if(lexical_cast<bool>(config.get_option("debug").value))
-       {
-               build_info.debug = true;
-               build_info.defines["DEBUG"] = "1";
-       }
-
        for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
                if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
                        build_info.defines["WITH_"+toupper(i->name)] = "1";