From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 11 Sep 2013 15:56:48 +0200 Subject: Merge up to r3319 --- buildscripts/phing/tasks/PradoDocTask.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'buildscripts/phing/tasks/PradoDocTask.php') diff --git a/buildscripts/phing/tasks/PradoDocTask.php b/buildscripts/phing/tasks/PradoDocTask.php index 944fde82..449ff711 100644 --- a/buildscripts/phing/tasks/PradoDocTask.php +++ b/buildscripts/phing/tasks/PradoDocTask.php @@ -16,7 +16,7 @@ class PradoDocTask extends Task private $ignorelist = ''; - private $output = ""; + private $template = ""; private $linksource = false; @@ -66,11 +66,11 @@ class PradoDocTask extends Task } /** - * Set the output type + * Set the template */ - function setOutput($output) + function setTemplate($template) { - $this->output = $output; + $this->template = $template; } /** @@ -92,6 +92,7 @@ class PradoDocTask extends Task function main() { $arguments = $this->constructArguments(); + echo $this->phpdoc . " " . $arguments."\n"; passthru($this->phpdoc . " " . $arguments, $retval); } @@ -109,7 +110,7 @@ class PradoDocTask extends Task if ($this->title) { - $arguments.= "-ti \"" . $this->title . "\" "; + $arguments.= "--title \"" . $this->title . "\" "; } if ($this->destdir) @@ -122,9 +123,9 @@ class PradoDocTask extends Task $arguments.= "-d \"" . $this->sourcepath->__toString() . "\" "; } - if ($this->output) + if ($this->template) { - $arguments.= "-o \"" . $this->output . "\" "; + $arguments.= "--template \"" . $this->template . "\" "; } if ($this->linksource) @@ -145,5 +146,3 @@ class PradoDocTask extends Task return $arguments; } } - -?> \ No newline at end of file -- cgit v1.2.3