Changeset 370

Show
Ignore:
Timestamp:
05/27/08 20:44:31 (7 months ago)
Author:
bender
Message:

Fixed problem with import of fully qualified build.xml.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.4/classes/phing/tasks/system/ImportTask.php

    r368 r370  
    9999    } 
    100100 
    101     $base = $this->project->getBasedir(); 
    102     $file = new PhingFile($this->project->getBasedir(), $this->file); 
     101    $file = new PhingFile($this->file); 
     102    if (!$file->isAbsolute()) { 
     103      $file = new PhingFile($this->project->getBasedir(), $this->file); 
     104    } 
    103105    if (!$file->exists()) { 
    104       $msg = "Unable to find build file: {$this->file->getName()}"; 
     106      $msg = "Unable to find build file: {$file->getPath()}"; 
    105107      if ($this->optional) { 
    106108        $this->log($msg . '... skipped'); 

  • branches/2.4/etc/VERSION.TXT

    r229 r370  
    1 Phing 2.3 BRANCH (2.3dev) 
     1Phing 2.4 BRANCH (2.4dev)