Changeset 102

Show
Ignore:
Timestamp:
08/08/06 20:19:44 (2 years ago)
Author:
hans
Message:

#49 - (TarTask) only create a default, all-inclusive fileset if no explicit fileset was specified.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2/classes/phing/tasks/ext/TarTask.php

    r94 r102  
    189189                    throw new BuildException("basedir does not exist!", $this->getLocation()); 
    190190                } 
    191  
    192                 // add the main fileset to the list of filesets to process. 
    193                 $mainFileSet = new TarFileSet($this->fileset); 
    194                 $mainFileSet->setDir($this->baseDir); 
    195                 $this->filesets[] = $mainFileSet; 
     191                                if (empty($this->filesets)) { // if there weren't any explicit filesets specivied, then 
     192                                                                          // create a default, all-inclusive fileset using the specified basedir. 
     193                        $mainFileSet = new TarFileSet($this->fileset); 
     194                        $mainFileSet->setDir($this->baseDir); 
     195                        $this->filesets[] = $mainFileSet; 
     196                    } 
    196197            } 
    197198