Code reorganizing and cleanup

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index d4022f5f3fae7b0f045ddea2087828d5eb987ad9..14d2321e26964229a04d68cc72716b791bc15978 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -12,30 +12,11 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n, const Path::Path &s):
        builder(b),
        name(n),
-       source(s),
        buildable(true),
+       source(s),
        build_info_ready(false)
 { }
 
-Package::Package(Builder &b, const string &n, const vector<string> &info):
-       builder(b),
-       name(n),
-       buildable(false),
-       build_info_ready(false)
-{
-       for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
-       {
-               if(!i->compare(0, 2, "-I"))
-                       export_binfo.incpath.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-D"))
-                       export_binfo.defines.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-L"))
-                       export_binfo.libpath.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-l"))
-                       export_binfo.libs.push_back(i->substr(2));
-       }
-}
-
 void Package::set_path(const Msp::Path::Path &p)
 {
        path=builder.get_cwd()/p;
@@ -43,7 +24,7 @@ void Package::set_path(const Msp::Path::Path &p)
 
 void Package::resolve_refs()
 {
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
                i->resolve();
        for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
                i->resolve_refs();
@@ -56,7 +37,7 @@ void Package::create_build_info()
        
        if(buildable)
        {
-               for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+               for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
                {
                        Package *pkg=i->get_package();
                        if(!pkg)
@@ -156,6 +137,27 @@ Package *Package::create(Builder &b, const string &name)
        return pkg;
 }
 
+/*** private ***/
+
+Package::Package(Builder &b, const string &n, const vector<string> &info):
+       builder(b),
+       name(n),
+       buildable(false),
+       build_info_ready(false)
+{
+       for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
+       {
+               if(!i->compare(0, 2, "-I"))
+                       export_binfo.incpath.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-D"))
+                       export_binfo.defines.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-L"))
+                       export_binfo.libpath.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-l"))
+                       export_binfo.libs.push_back(i->substr(2));
+       }
+}
+
 void Package::init_buildable()
 {
        buildable=true;
@@ -179,7 +181,7 @@ void Package::init_buildable()
        if(flags&DATA)
                config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
 
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
                config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name());
 
        config.load(source/".options.cache");