-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
#include <set>
#include <cstdlib>
#include <msp/core/getopt.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
-#include "action.h"
#include "analyzer.h"
#include "binarypackage.h"
#include "builder.h"
-#include "header.h"
-#include "install.h"
+#include "copy.h"
+#include "gnuarchiver.h"
+#include "gnuccompiler.h"
+#include "gnucxxcompiler.h"
+#include "gnulinker.h"
+#include "installedfile.h"
#include "misc.h"
#include "package.h"
#include "pkgconfig.h"
+#include "pkgconfiggenerator.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
-#include "systemlibrary.h"
-#include "unlink.h"
+#include "tar.h"
+#include "task.h"
#include "virtualtarget.h"
using namespace std;
using namespace Msp;
-namespace {
-
-void update_hash(string &hash, const string &value)
-{
- for(unsigned i=0; i<value.size(); ++i)
- hash[i%hash.size()] ^= value[i];
-}
-
-}
-
-
Builder::Builder(int argc, char **argv):
main_pkg(0),
native_arch(*this, string()),
+ vfs(*this),
analyzer(0),
build(false),
clean(0),
cwd = FS::getcwd();
- native_arch.set_tool("CC", "gcc");
- native_arch.set_tool("CXX", "g++");
- native_arch.set_tool("LD", "gcc");
- native_arch.set_tool("LXX", "g++");
- native_arch.set_tool("AR", "ar");
+ toolchain.add_tool(new GnuCCompiler(*this));
+ toolchain.add_tool(new GnuCxxCompiler(*this));
+ toolchain.add_tool(new GnuLinker(*this));
+ toolchain.add_tool(new GnuArchiver(*this));
+ toolchain.add_tool(new Copy(*this));
+ toolchain.add_tool(new Tar(*this));
+ toolchain.add_tool(new PkgConfigGenerator(*this));
load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
load_build_file((FS::get_user_data_dir("builder")/"rc").str());
if(j->second->get_package()==i->second)
{
++count;
- if(j->second->get_rebuild())
+ if(j->second->needs_rebuild())
++to_be_built;
}
if(count)
Target *Builder::get_target(const string &n) const
{
- // XXX Used for getting targets by path. get_target(const FS::Path &)?
TargetMap::const_iterator i = targets.find(n);
if(i!=targets.end())
return i->second;
return 0;
}
-Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
-{
- string hash(8, 0);
- if(include[0]=='\"')
- update_hash(hash, from.str());
- for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
- update_hash(hash, *i);
-
- string id = hash+include;
- TargetMap::iterator i = includes.find(id);
- if(i!=includes.end())
- return i->second;
-
- static string cxx_ver;
- if(cxx_ver.empty())
- {
- StringList argv;
- argv.push_back(current_arch->get_tool("CXX"));
- argv.push_back("--version");
- if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv)))
- {
- cxx_ver = m[0].str;
- while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
- {
- string::size_type dot = cxx_ver.rfind('.');
- if(dot==string::npos)
- break;
- cxx_ver.erase(dot);
- }
- if(verbose>=5)
- IO::print("C++ version is %s\n", cxx_ver);
- }
- else
- cxx_ver = "-";
- }
-
- string fn = include.substr(1);
- if(verbose>=5)
- IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
-
- StringList syspath;
- if(current_arch->is_native())
- syspath.push_back("/usr/include");
- else
- syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/include");
- if(cxx_ver!="-")
- syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
-
- Target *tgt = 0;
- if(include[0]=='\"')
- tgt = get_header(FS::Path(from)/fn);
- for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
- tgt = get_header(cwd/ *j/fn);
- for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt = get_header(FS::Path(*j)/fn);
-
- includes.insert(TargetMap::value_type(id, tgt));
-
- return tgt;
-}
-
-Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
-{
- string hash(8, 0);
- for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
- update_hash(hash, *i);
-
- string id = hash+string(1, mode)+lib;
- TargetMap::iterator i = libraries.find(id);
- if(i!=libraries.end())
- return i->second;
-
- StringList syspath;
- if(current_arch->is_native())
- {
- syspath.push_back("/lib");
- syspath.push_back("/usr/lib");
- }
- else
- syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib");
-
- if(verbose>=5)
- IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
-
- Target *tgt = 0;
- for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
- tgt = get_library(lib, cwd/ *j, mode);
- for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt = get_library(lib, *j, mode);
-
- libraries.insert(TargetMap::value_type(id, tgt));
-
- return tgt;
-}
-
void Builder::apply_profile_template(Config &config, const string &pt) const
{
vector<string> parts = split(pt, '-');
problems.push_back(Problem(p, d));
}
-void Builder::add_target(FileTarget *t)
-{
- targets.insert(TargetMap::value_type(t->get_path().str(), t));
- new_tgts.push_back(t);
-}
-
-void Builder::add_target(VirtualTarget *t)
+void Builder::add_target(Target *t)
{
targets.insert(TargetMap::value_type(t->get_name(), t));
new_tgts.push_back(t);
int Builder::load_build_file(const FS::Path &fn)
{
- try
- {
- IO::BufferedFile in(fn.str());
+ if(!FS::exists(fn))
+ return -1;
- if(verbose>=3)
- IO::print("Reading %s\n", fn);
+ IO::BufferedFile in(fn.str());
- DataFile::Parser parser(in, fn.str());
- Loader loader(*this, fn.subpath(0, fn.size()-1));
- loader.load(parser);
- }
- catch(const IO::file_not_found &)
- {
- return -1;
- }
+ if(verbose>=3)
+ IO::print("Reading %s\n", fn);
+
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, fn.subpath(0, fn.size()-1));
+ loader.load(parser);
return 0;
}
if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
{
PkgConfig *pc = new PkgConfig(*this, *spkg);
- install->add_depend(new Install(*this, *spkg, *pc));
+ install->add_depend(new InstalledFile(*this, *spkg, *pc));
}
}
- // Find dependencies until no new targets are created
- while(!new_tgts.empty())
- {
- Target *tgt = new_tgts.front();
- new_tgts.erase(new_tgts.begin());
- tgt->find_depends();
- if(!tgt->get_depends_ready())
- new_tgts.push_back(tgt);
- }
-
// Apply what-ifs
+ // XXX This does not currently work with targets found during dependency discovery
for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
{
- FileTarget *tgt = dynamic_cast<FileTarget *>(get_target((cwd/ *i).str()));
+ FileTarget *tgt = vfs.get_target(cwd/ *i);
if(!tgt)
{
IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
{
Target *tgt = get_target(*i);
if(!tgt)
- tgt = get_target((cwd/ *i).str());
+ tgt = vfs.get_target(*i);
+ if(!tgt)
+ tgt = vfs.get_target(cwd/ *i);
if(!tgt)
{
IO::print("I don't know anything about %s\n", *i);
return 0;
}
-Target *Builder::get_header(const FS::Path &fn)
-{
- Target *tgt = get_target(fn.str());
- if(tgt) return tgt;
-
- if(FS::is_reg(fn))
- {
- tgt = new SystemHeader(*this, fn.str());
- return tgt;
- }
- return 0;
-}
-
-Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
-{
- // Populate a list of candidate filenames
- StringList candidates;
-
- if(mode!=ALL_STATIC)
- {
- // XXX Should probably let the Architecture populate the list
- if(current_arch->get_system()=="windows")
- {
- candidates.push_back("lib"+lib+".dll");
- candidates.push_back(lib+".dll");
- }
- else
- candidates.push_back("lib"+lib+".so");
- }
-
- /* Static libraries are always considered, since sometimes shared versions
- may not be available */
- candidates.push_back("lib"+lib+".a");
- if(current_arch->get_system()=="windows")
- candidates.push_back("lib"+lib+".dll.a");
-
- for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
- {
- string full = (path/ *i).str();
- Target *tgt = get_target(full);
-
- if(tgt)
- {
- Target *real_tgt = tgt->get_real_target();
-
- /* Ignore dynamic libraries from local packages unless library mode is
- DYNAMIC */
- if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
- continue;
- else if(tgt)
- return tgt;
- }
- else if(FS::is_reg(full))
- {
- tgt = new SystemLibrary(*this, full);
- return tgt;
- }
- }
-
- return 0;
-}
-
int Builder::do_build()
{
Target *cmdline = get_target("cmdline");
unsigned total = 0;
for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->is_buildable() && i->second->get_rebuild())
+ if(i->second->is_buildable() && i->second->needs_rebuild())
++total;
if(!total)
if(verbose>=1)
IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : ""));
- vector<Action *> actions;
+ vector<Task *> tasks;
unsigned count = 0;
while(!finish)
{
- if(actions.size()<jobs && !fail)
+ if(tasks.size()<jobs && !fail)
{
Target *tgt = cmdline->get_buildable_target();
if(tgt)
{
- Action *action = tgt->build();
- if(action)
- actions.push_back(action);
+ if(tgt->get_tool())
+ IO::print("%-4s %s\n", tgt->get_tool()->get_tag(), tgt->get_name());
+ Task *task = tgt->build();
+ if(task)
+ {
+ if(verbose>=2)
+ IO::print("%s\n", task->get_command());
+ if(dry_run)
+ {
+ task->signal_finished.emit(true);
+ delete task;
+ }
+ else
+ {
+ task->start();
+ tasks.push_back(task);
+ }
+ }
if(show_progress)
IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
}
- else if(actions.empty())
+ else if(tasks.empty())
finish = true;
}
else
Time::sleep(10*Time::msec);
- for(unsigned i=0; i<actions.size();)
+ for(unsigned i=0; i<tasks.size();)
{
- int status = actions[i]->check();
- if(status>=0)
+ Task::Status status = tasks[i]->check();
+ if(status!=Task::RUNNING)
{
++count;
- delete actions[i];
- actions.erase(actions.begin()+i);
- if(status>0)
+ delete tasks[i];
+ tasks.erase(tasks.begin()+i);
+ if(status==Task::ERROR)
fail = true;
- if(actions.empty() && fail)
+ if(tasks.empty() && fail)
finish = true;
}
else
// Cleaning doesn't care about ordering, so a simpler method can be used
set<Target *> clean_tgts;
- TargetList queue;
+ list<Target *> queue;
queue.push_back(get_target("cmdline"));
while(!queue.empty())
if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
clean_tgts.insert(tgt);
- const TargetList &deps = tgt->get_depends();
- for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+ const Target::Dependencies &deps = tgt->get_depends();
+ for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
if(!clean_tgts.count(*i))
queue.push_back(*i);
}
for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
- {
- Action *action = new Unlink(*this, *ft);
- while(action->check()<0) ;
- delete action;
- }
+ if(ft->get_mtime())
+ FS::unlink(ft->get_path());
return 0;
}
projects / builder.git / blobdiff