]> git.tdb.fi Git - builder.git/commitdiff
Drop some deprecated datafile statements from Component
authorMikko Rasa <tdb@tdb.fi>
Sat, 21 Apr 2012 18:24:46 +0000 (21:24 +0300)
committerMikko Rasa <tdb@tdb.fi>
Sun, 8 Jul 2012 21:08:49 +0000 (00:08 +0300)
source/component.cpp
source/component.h

index 1eb93ceeee357a80501643d8d0053ae07edbaf8f..bb1efe41df6f055184dff6d2147dbec3eba3067a 100644 (file)
@@ -265,11 +265,8 @@ Component::Loader::Loader(Component &c):
 {
        add("source",          &Loader::source);
        add("install",         &Component::install);
-       add("install_headers", &Loader::install_headers);
        add("build_info",      &Loader::build_info);
        add("require",         &Loader::require);
-       add("modular",         &Loader::modular);
-       add("host",            &Loader::host);
        add("default",         &Component::deflt);
 }
 
@@ -296,30 +293,6 @@ void Component::Loader::require(const string &n)
                comp.requires.push_back(req);
 }
 
-void Component::Loader::modular()
-{
-       IO::print("%s: Note: modular is deprecated\n", get_source());
-       comp.build_info.ldflags.push_back("-rdynamic");
-       comp.build_info.libs.push_back("dl");
-}
-
-void Component::Loader::host(const string &)
-{
-       IO::print("%s: Note: host is deprecated\n", get_source());
-}
-
-void Component::Loader::install_headers(const string &p)
-{
-       IO::print("%s: Note: install_headers is deprecated\n", get_source());
-       if(comp.type==HEADERS)
-       {
-               comp.name = p;
-               comp.install = true;
-       }
-       else
-               inst_hdr = p;
-}
-
 void Component::Loader::build_info()
 {
        load_sub(comp.build_info);
index 890cad48cb72527a916fac1e3b0dc7bd11bad88e..0f9d581bcfb1695805036437edb73ed5bf2eea39 100644 (file)
@@ -32,9 +32,6 @@ public:
                virtual void finish();
                void source(const std::string &);
                void require(const std::string &);
-               void modular();
-               void host(const std::string &);
-               void install_headers(const std::string &);
                void build_info();
        };