X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fexternaltask.h;h=00465f3af4f3ba501952f1a7bf29ce149d04865a;hp=992df5c692a4c7bf8dfd6e6a208d2c64f15afdc0;hb=4b075b4a7ed921be62740c302edeebcd8b06ca29;hpb=276a7c7c046a8f1b692cecbd53f17595ed23264d diff --git a/source/externaltask.h b/source/externaltask.h index 992df5c..00465f3 100644 --- a/source/externaltask.h +++ b/source/externaltask.h @@ -16,10 +16,11 @@ be captured. class ExternalTask: public Task { public: - enum Destination + enum StreamAction { PASSTHROUGH, //< Do not touch the stream CAPTURE, //< Capture the stream + REDIRECT, //< Redirect the stream to/from a file IGNORE //< Redirect the stream to oblivion }; @@ -30,8 +31,10 @@ private: Msp::FS::Path work_dir; Msp::Process *process; int exit_code; - Destination stdout_dest; - Destination stderr_dest; + Msp::FS::Path stdin_file; + StreamAction stdout_action; + Msp::FS::Path stdout_file; + StreamAction stderr_action; Msp::IO::Pipe *capture_pipe; std::string output; @@ -51,11 +54,17 @@ private: Status do_wait(bool); public: + /// Redirect stdin from a file. Has no effect after the task is started. + void set_stdin(const Msp::FS::Path &); + /// Sets destination for stdout. Has no effect after the task is started. - void set_stdout(Destination); + void set_stdout(StreamAction); + + /// Redirect stdout to a file. Has no effect after the task is started. + void set_stdout(const Msp::FS::Path &); /// Sets destination for stderr. Has no effect after the task is started. - void set_stderr(Destination); + void set_stderr(StreamAction); /** Returns captured output, if any. This may be called while the task is still running, but it will always return all output. */