#include <fstream>
#include <iostream>
-#include <msp/progress.h>
+#include <set>
#include <msp/core/error.h>
#include <msp/getopt++/getopt++.h>
#include <msp/parser/parser.h>
#include "sharedlibrary.h"
#include "staticlibrary.h"
#include "systemlibrary.h"
+#include "unlink.h"
#include "virtualtarget.h"
using namespace std;
Builder::Builder(int argc, char **argv):
analyzer(0),
- do_build(false),
+ build(false),
+ clean(0),
dry_run(false),
help(false),
verbose(1),
jobs(1),
conf_all(false),
conf_only(false),
- build_all(false)
+ build_all(false),
+ create_makefile(false)
{
string analyze_mode;
string work_dir;
bool full_paths=false;
unsigned max_depth=5;
-
+
GetOpt getopt;
getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG);
- getopt.add_option('b', "build", do_build, GetOpt::NO_ARG);
-// getopt.add_option('c', "clean", clean, GetOpt::NO_ARG);
+ getopt.add_option('b', "build", build, GetOpt::NO_ARG);
+ getopt.add_option('c', "clean", clean, GetOpt::NO_ARG);
getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG);
getopt.add_option('h', "help", help, GetOpt::NO_ARG);
getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG);
getopt.add_option( "chrome", chrome, GetOpt::NO_ARG);
getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG);
getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG);
+ //getopt.add_option( "makefile", create_makefile, GetOpt::NO_ARG);
getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG);
getopt(argc, argv);
analyzer->set_max_depth(max_depth);
analyzer->set_full_paths(full_paths);
}
- else
- do_build=true;
+ else if(!clean && !create_makefile)
+ build=true;
const list<string> &args=getopt.get_args();
for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
cwd=Path::getcwd();
archs.insert(StringMap::value_type("native", ""));
- archs.insert(StringMap::value_type("arm", "arm-linux-gnu-"));
- archs.insert(StringMap::value_type("win32", "i586-mingw32msvc-"));
+ archs.insert(StringMap::value_type("arm", "arm-linux-gnu"));
+ archs.insert(StringMap::value_type("win32", "i586-mingw32msvc"));
StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second;
native_tools.insert(StringMap::value_type("CC", "gcc"));
{
if(i->first=="native")
continue;
-
+
StringMap &arch_profile=profile_tmpl.insert(ProfileTemplateMap::value_type(i->first, StringMap())).first->second;
arch_profile.insert(StringMap::value_type("arch", i->first));
arch_profile.insert(StringMap::value_type("prefix", "$HOME/local/$arch"));
+ arch_profile.insert(StringMap::value_type("outdir", "$profile"));
}
}
argv.push_back("--variable=source");
argv.push_back(n);
string srcdir=strip(run_command(argv));
-
+
PathList dirs;
if(!srcdir.empty())
dirs.push_back(srcdir);
is not found but a file exists, a new SystemHeader target will be created and
returned.
*/
-Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
+Target *Builder::get_header(const string &include, const string &, const string &from, const list<string> &path)
{
string hash(8, 0);
update_hash(hash, from);
}
includes.insert(TargetMap::value_type(id, tgt));
-
+
return tgt;
}
@return Some kind of library target, if a match was found
*/
-Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const string &arch, const list<string> &path, LibMode mode)
{
string hash(8, 0);
for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
if(i!=libraries.end())
return i->second;
- Target *tgt=0;
- if((tgt=get_library(lib, "/lib", mode)))
- ;
- else if((tgt=get_library(lib, "/usr/lib", mode)))
- ;
- else
+ StringList syspath;
+ if(arch=="native")
{
- for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_library(lib, cwd/ *j, mode);
+ syspath.push_back("/lib");
+ syspath.push_back("/usr/lib");
}
+ else
+ syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
+
+ Target *tgt=0;
+ for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_library(lib, arch, *j, mode);
+ for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
+ tgt=get_library(lib, arch, cwd/ *j, mode);
libraries.insert(TargetMap::value_type(id, tgt));
if(j==i->second.end())
throw InvalidParameterValue("Unknown tool");
- return get_arch_prefix(arch)+j->second;
+ return get_arch_prefix(arch)+"-"+j->second;
}
void Builder::apply_profile_template(Config &config, const string &pt) const
if(analyzer)
analyzer->analyze();
- if(do_build)
- build();
+ //if(create_makefile
+
+ if(clean)
+ exit_code=do_clean();
+ else if(build)
+ exit_code=do_build();
return exit_code;
}
{
if(reason)
cerr<<reason<<'\n';
-
+
if(brief)
cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]";
else
" --chrome Use extra chrome to print status.\n"
" --conf-only Stop after configuring packages.\n"
" --full-paths Output full paths in analysis.\n"
+ //" --makefile Create a makefile for this package.\n"
" --max-depth NUM Maximum depth to show in analysis.\n";
}
}
}
bool build_exe=j->get_type()!=Component::HEADERS;
-
+
list<ObjectFile *> objs;
for(PathList::iterator k=files.begin(); k!=files.end(); ++k)
{
}
else
exe=new Executable(*this, *j, objs);
-
+
add_target(exe);
if(i->second==default_pkg)
{
return 0;
}
-Target *Builder::get_library(const string &lib, const Path::Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
{
- string full;
- if(mode!=DYNAMIC)
- {
- full=(path/("lib"+lib+".a")).str();
- Target *tgt=get_target(full);
- // Targets can only be associated with buildable packages (or no package at all)
- if(tgt && (tgt->get_package() || mode==ALL_STATIC)) return tgt;
- }
+ // Populate a list of candidate filenames
+ StringList candidates;
+
if(mode!=ALL_STATIC)
{
- full=(path/("lib"+lib+".so")).str();
- Target *tgt=get_target(full);
- if(tgt) return tgt;
+ if(arch=="win32")
+ candidates.push_back("lib"+lib+".dll");
+ else
+ candidates.push_back("lib"+lib+".so");
}
- if(Path::exists(full))
+ /* Static libraries are always considered, since sometimes shared versions
+ may not be available */
+ candidates.push_back("lib"+lib+".a");
+ if(arch=="win32")
+ candidates.push_back("lib"+lib+".dll.a");
+
+ for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
{
- Target *tgt=new SystemLibrary(*this, full);
- add_target(tgt);
- return tgt;
+ string full=(path/ *i).str();
+ Target *tgt=get_target(full);
+
+ if(tgt)
+ {
+ Target *real_tgt=tgt;
+ if(dynamic_cast<Install *>(tgt))
+ real_tgt=real_tgt->get_depends().front();
+
+ /* 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(Path::exists(full))
+ {
+ tgt=new SystemLibrary(*this, full);
+ add_target(tgt);
+ return tgt;
+ }
}
return 0;
This function supervises the build process, starting new actions when slots
become available.
*/
-int Builder::build()
+int Builder::do_build()
{
Target *cmdline=get_target("cmdline");
if(fail)
cout<<"Build failed\n";
- return fail?-1:0;
+ return fail?1:0;
+}
+
+/**
+Cleans buildable targets. If clean is 1, cleans only this package. If
+clean is 2 or greater, cleans all buildable packages.
+*/
+int Builder::do_clean()
+{
+ // Cleaning doesn't care about ordering, so a simpler method can be used
+
+ set<Target *> clean_tgts;
+ TargetList queue;
+ queue.push_back(get_target("cmdline"));
+
+ while(!queue.empty())
+ {
+ Target *tgt=queue.front();
+ queue.erase(queue.begin());
+
+ if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2))
+ clean_tgts.insert(tgt);
+
+ const TargetList &deps=tgt->get_depends();
+ for(TargetList::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)
+ {
+ Action *action=new Unlink(*this, **i);
+ while(action->check()<0);
+ delete action;
+ }
+
+ return 0;
}
/**
projects / builder.git / blobdiff