Rename create_targets to prepare_build and make it return bool

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 44faa071512280cec93c9ee8e8348e51c63333a0..06ab5fe7441953a9652b9ae40b2c2df208755de9 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -63,71 +63,6 @@ FS::Path SourcePackage::get_out_dir() const
                return source/arch.get_name()/detail;
 }
 
-string SourcePackage::expand_string(const string &str) const
-{
-       string result = str;
-       string::size_type dollar = 0;
-       unsigned n = 0;
-       while((dollar = result.find('$'))!=string::npos)
-       {
-               if(n>1000)
-                       throw bad_expansion("nested too deep");
-
-               string::size_type end;
-               string var;
-               if(dollar+1<result.size() && result[dollar+1]=='{')
-               {
-                       end = result.find('}', dollar+2);
-                       if(end==string::npos)
-                               throw bad_expansion("unterminated variable reference");
-                       var = result.substr(dollar+2, end-dollar-2);
-                       ++end;
-               }
-               else
-               {
-                       for(end=dollar+1; (isalnum(result[end]) || result[end]=='_'); ++end) ;
-                       var = result.substr(dollar+1, end-dollar-1);
-               }
-
-               string value;
-               if(config.is_option(var))
-                       value = config.get_option(var).value;
-               else if(var=="arch")
-                       value = builder.get_current_arch().get_name();
-               else if(var=="system")
-                       value = builder.get_current_arch().get_system();
-               else if(const char *ptr = getenv(var.c_str()))
-                       value = ptr;
-
-               result.replace(dollar, end-dollar, value);
-
-               ++n;
-       }
-
-       return result;
-}
-
-void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
-{
-       init_config();
-
-       config.load();
-
-       if(flag && config.update(opts))
-               builder.get_logger().log("configure", format("Configuration of %s changed", name));
-
-       config.finish();
-
-       deps_cache.load();
-
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-               i->configure(opts, flag);
-}
-
-void SourcePackage::init_config()
-{
-}
-
 void SourcePackage::create_build_info()
 {
        if(build_type)
@@ -156,6 +91,7 @@ void SourcePackage::create_build_info()
 
        for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
        {
+               i->prepare();
                i->create_build_info();
                if(i->get_type()==Component::LIBRARY)
                        export_binfo.libs.push_back(i->get_name());
@@ -164,6 +100,8 @@ void SourcePackage::create_build_info()
 
 void SourcePackage::create_targets()
 {
+       deps_cache.load();
+
        bool pc_needed = false;
        for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
        {