#include <msp/io/file.h>
#include <msp/io/print.h>
#include <msp/strings/format.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
#include <msp/time/utils.h>
+#include "androidtools.h"
#include "binarypackage.h"
#include "builder.h"
-#include "copy.h"
+#include "builtintools.h"
#include "datatool.h"
-#include "gnuarchiver.h"
-#include "gnuccompiler.h"
-#include "gnucxxcompiler.h"
-#include "gnulinker.h"
#include "installedfile.h"
-#include "mingwdlltool.h"
#include "package.h"
-#include "pkgconfiggenerator.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
-#include "tar.h"
+#include "systemtools.h"
#include "task.h"
#include "virtualtarget.h"
void Builder::add_default_tools()
{
- toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
- toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
- toolchain.add_tool(new GnuLinker(*this, *current_arch));
- toolchain.add_tool(new GnuArchiver(*this, *current_arch));
- toolchain.add_tool(new Copy(*this));
- toolchain.add_tool(new Tar(*this));
- toolchain.add_tool(new PkgConfigGenerator(*this));
- if(current_arch->get_system()=="windows")
- toolchain.add_tool(new MingwDllTool(*this, *current_arch));
+ if(current_arch->get_system()=="android")
+ toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
+ toolchain.add_toolchain(new SystemTools(*this, *current_arch));
+ toolchain.add_toolchain(new BuiltinTools(*this));
toolchain.add_tool(new DataTool(*this));
}
set<Target *> clean_tgts;
list<Target *> queue;
- queue.push_back(build_graph.get_target("cmdline"));
+ queue.push_back(&build_graph.get_goals());
while(!queue.empty())
{
Target *tgt = queue.front();
- queue.erase(queue.begin());
+ queue.pop_front();
if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
clean_tgts.insert(tgt);