Changeset 1872

Show
Ignore:
Timestamp:
09/30/08 17:01:36 (3 months ago)
Author:
mikey
Message:

get rid of stubConfig::useStar()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • framework/trunk/src/main/php/org/stubbles/phing/tasks/stubInitClassLoaderTask.php

    r1763 r1872  
    77 * @package     stubbles 
    88 * @subpackage  phing_tasks 
     9 * @version     $Id$ 
    910 */ 
    1011/** 
    …… 
    3839        } 
    3940         
    40         if (stubConfig::useStar() === true) { 
     41        if (file_exists(stubConfig::getLibPath() . '/stubbles.php') === true) { 
    4142            if ((include_once stubConfig::getLibPath() . '/stubbles.php') === false) { 
    4243                $this->log('Error loading Stubbles library from ' . stubConfig::getLibPath() . '/stubbles.php', Project::MSG_ERR); 
    …… 
    4546            } 
    4647        } else { 
     48            if (!@include_once stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php') { 
     49                $this->log('Error loading stubClassLoader from ' . stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php', Project::MSG_ERR); 
     50                $this->log('Either stubConfig::getSourcePath() is not correctly set, or you are not using a source distribution.', Project::MSG_ERR); 
     51                throw new BuildException('Error loading stubClassLoader from ' . stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php'); 
     52            } 
     53             
    4754            if ((include_once stubConfig::getLibPath() . '/starWriter.php') === false) { 
    4855                $this->log('Error loading StarWriter from ' . stubConfig::getLibPath() . '/starWriter.php', Project::MSG_ERR); 
    4956                $this->log('Either stubConfig::getLibPath() is not correctly set, or starWriter.php does not exist.', Project::MSG_ERR); 
    5057                throw new BuildException('Error loading StarWriter from ' . stubConfig::getLibPath() . '/starWriter.php'); 
    51             } 
    52              
    53             if (!@include_once stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php') { 
    54                 $this->log('Error loading stubClassLoader from ' . stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php', Project::MSG_ERR); 
    55                 $this->log('Either stubConfig::getSourcePath() is not correctly set, or you are not using a source distribution.', Project::MSG_ERR); 
    56                 throw new BuildException('Error loading stubClassLoader from ' . stubConfig::getSourcePath() . '/php/net/stubbles/stubClassLoader.php'); 
    5758            } 
    5859        }