Navigation

Changeset 6

Timestamp:

02/09/06 08:39:54 (3 years ago)

Author:

hans

Message:

Added smarter handling of 'dir' attribute of <resolvepath> task; it will only be used if 'file' attribute is not an absolute path.

Files:

r1	r6
104	104	}
105	105
	106	$fs = FileSystem::getFileSystem();
	107
106	108	// if dir attribute was specified then we should
107	109	// use that as basedir to which file was relative.
108		if ($this->dir !== null) {
	110	// -- unless the file specified is an absolute path
	111	if ($this->dir !== null && !$fs->isAbsolute(new PhingFile($this->file))) {
109	112	$resolved = new PhingFile($this->dir->getPath(), $this->file);
110	113	} else {
…	…
117	120	}
118	121
119
120
121	122	}

r1	r6
104	104	}
105	105
	106	$fs = FileSystem::getFileSystem();
	107
106	108	// if dir attribute was specified then we should
107	109	// use that as basedir to which file was relative.
108		if ($this->dir !== null) {
	110	// -- unless the file specified is an absolute path
	111	if ($this->dir !== null && !$fs->isAbsolute(new PhingFile($this->file))) {
109	112	$resolved = new PhingFile($this->dir->getPath(), $this->file);
110	113	} else {
…	…
117	120	}
118	121
119
120
121	122	}