X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompilecommandsgenerator.cpp;h=bbd4e980742c70c96621d234ff7eeda0845a1c0c;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=8e3947d7816a119916097b7bd7079b819759dd96;hpb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;p=builder.git

diff --git a/source/compilecommandsgenerator.cpp b/source/compilecommandsgenerator.cpp
index 8e3947d..bbd4e98 100644
--- a/source/compilecommandsgenerator.cpp
+++ b/source/compilecommandsgenerator.cpp
@@ -4,32 +4,31 @@
 #include "builder.h"
 #include "compilecommandsgenerator.h"
 #include "compilecommandsjson.h"
+#include "internaltask.h"
 #include "objectfile.h"
 #include "sourcefile.h"
 
 using namespace std;
 using namespace Msp;
 
-Target *CompileCommandsGenerator::create_target(const vector<Target *> &, const string &)
+CompileCommandsGenerator::CompileCommandsGenerator(Builder &b):
+	Tool(b, "CCJG")
 {
-	throw logic_error("Not implemented");
+	set_run_internal(_run);
 }
 
-Task *CompileCommandsGenerator::run(const Target &target) const
+Target *CompileCommandsGenerator::create_target(const vector<Target *> &, const string &)
 {
-	const CompileCommandsJson &cmds = dynamic_cast<const CompileCommandsJson &>(target);
-	Worker *worker = new Worker(cmds);
-	return new InternalTask(worker);
+	throw logic_error("Not implemented");
 }
 
-
-void CompileCommandsGenerator::Worker::main()
+bool CompileCommandsGenerator::_run(const CompileCommandsJson &cmds)
 {
-	Builder &builder = target.get_package()->get_builder();
-	const SourcePackage &spkg = *target.get_package();
+	Builder &builder = cmds.get_package()->get_builder();
+	const SourcePackage &spkg = *cmds.get_package();
 	string work_dir = c_escape(spkg.get_source_directory().str());
 
-	IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
+	IO::BufferedFile out(cmds.get_path().str(), IO::M_WRITE);
 	IO::print(out, "[");
 
 	bool first = true;
@@ -52,5 +51,5 @@ void CompileCommandsGenerator::Worker::main()
 
 	IO::print(out, "\n]\n");
 
-	status = Task::SUCCESS;
+	return true;
 }