Navigation

Changeset 251

Timestamp:

10/17/07 01:12:23 (9 months ago)

Author:

hans

Message:

Merging fix for #150 into trunk

Files:

r158	r251
37	37	* Constructs a new PhingPhpDocumentorSetup.
38	38	*
	39	* @param string $configDir Directory in which to look for configuration files.
39	40	*/
40		public function __construct() {
	41	public function __construct($configdir = null) {
41	42	global $_phpDocumentor_cvsphpfile_exts, $_phpDocumentor_setting;
42	43
…	…
44	45	$this->render = new phpDocumentor_IntermediateParser("Default Title");
45	46
	47	$GLOBALS['_phpDocumentor_install_dir'] = $configdir;
46	48	$this->parseIni();
47	49

r199	r251
110	110
111	111	/**
	112	* @var PhingFile Directory in which to look for configuration files.
	113	*/
	114	private $configDir;
	115
	116	/**
112	117	* @var boolean Whether to parse as a PEAR repository.
113	118	*/
…	…
200	205	public function setExamplesdir(PhingFile $d) {
201	206	$this->examplesDir = $d;
	207	}
	208
	209	/**
	210	* Set a directory to search for configuration files in.
	211	* @param PhingFile $d
	212	*/
	213	public function setConfigdir(PhingFile $d) {
	214	$this->configDir = $d;
202	215	}
203	216
…	…
286	299	{
287	300	$this->validate();
288		$phpdoc = new PhingPhpDocumentorSetup();
	301	$configdir = $this->configDir ? $this->configDir->getAbsolutePath() : null;
	302	$phpdoc = new PhingPhpDocumentorSetup($configdir);
289	303	$this->setPhpDocumentorOptions($phpdoc);
290	304	//$phpdoc->readCommandLineSettings();