X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexternaltask.h;h=a5f10ec0b0c1486ce6b7b951d8dd10e668923cfb;hb=1dbeace0c44127bee08a3a8b231f4c8dcf707b2c;hp=b23bb66728805e280359705ff61a6b2b1436b55f;hpb=e2dc7122774e5d8de07731f3abe15ec0a9ffa643;p=builder.git

diff --git a/source/externaltask.h b/source/externaltask.h
index b23bb66..a5f10ec 100644
--- a/source/externaltask.h
+++ b/source/externaltask.h
@@ -7,6 +7,11 @@
 #include <msp/io/pipe.h>
 #include "task.h"
 
+/**
+Runs an external command.  A zero exit status is translated to a SUCCESS status
+for the task, and anything else is treated as an error.  Output can optionally
+be captured.
+*/
 class ExternalTask: public Task
 {
 public:
@@ -17,8 +22,10 @@ public:
 		IGNORE
 	};
 
+	typedef std::vector<std::string> Arguments;
+
 private:
-	std::vector<std::string> argv;
+	Arguments argv;
 	Msp::FS::Path work_dir;
 	int pid;
 	int exit_code;
@@ -28,16 +35,28 @@ private:
 	std::string output;
 
 public:
-	ExternalTask(const std::vector<std::string> &, const Msp::FS::Path &);
+	/** Creates an ExternalTask with an argument array and an optional working
+	directory.  The first element of the argument array should be the command
+	name.  If the working directory is not specified, no chdir is done. */
+	ExternalTask(const Arguments &, const Msp::FS::Path & = Msp::FS::Path());
+
 	virtual ~ExternalTask();
 
 	virtual std::string get_command() const;
 	virtual void start();
 	virtual Status check();
+	Status wait();
+private:
+	Status do_wait(bool);
 
+public:
 	void set_stdout(Destination);
 	void set_stderr(Destination);
 	const std::string &get_output() const { return output; }
+
+	/** Executes a command and captures its output.  Stderr is ignored, but if
+	the command exits with a nonzero status, an exception is thrown. */
+	static std::string run_and_capture_output(const Arguments &, const Msp::FS::Path & = Msp::FS::Path());
 };
 
 #endif