Changeset 1652

Show
Ignore:
Timestamp:
06/24/08 09:49:01 (3 months ago)
Author:
mikey
Message:

got rid of target projectcheck

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/resources/phing/build-stubbles.xml

    r1647 r1652  
    4747  </target> 
    4848 
    49   <target name="projectcheck" unless="stubbles.project"> 
    50     <input propertyname="stubbles.project" promptChar=":">Please enter the name of the project to use the config from</input> 
    51   </target> 
    52  
    5349  <target name="setup-examples" description="Sets up all examples."> 
    5450    <echo>----------------------------------</echo> 
    …… 
    8076    <input propertyname="cleanup.dist.confirm" promptChar="?" defaultValue="N">Are you sure, you want to remove project dist? (Y/N)</input> 
    8177    <if> 
    82       <equals arg1="${cleanup.dist.confirm}" arg2="Y" casesensitive="false" /> 
     78      <equals arg1="${cleanup.dist.confirm}" arg2="Y" casesensitive="false"/> 
    8379      <then> 
    8480        <delete dir="${stubbles.projects.path}/dist" includeemptydirs="true" verbose="true" failonerror="true"/> 
    8581      </then> 
    8682    </if> 
    87   </target> 
    88  
    89   <target name="init-stubbles" depends="projectcheck" description="Loads class loader."> 
    90     <echo>----------------------------------</echo> 
    91     <echo>| Loading Stubbles classloader   |</echo> 
    92     <echo>----------------------------------</echo> 
    93     <stubInitConfig configPath="${stubbles.projects.path}/${stubbles.project}/config"/> 
    94     <stubInitClassLoader/> 
    9583  </target> 
    9684 
    …… 
    132120  </target> 
    133121 
    134   <target name="generate-clients" depends="init-stubbles" description="Generates JSON-RPC clients for all projects."> 
     122  <target name="generate-clients" description="Generates JSON-RPC clients for all projects."> 
    135123    <echo>----------------------------------</echo> 
    136124    <echo>| Generating JSON-RPC proxies    |</echo> 
    …… 
    174162               
    175163              $this->project->setProperty('projects', join(',', $projects)); 
     164              $this->project->setProperty('first.project', $projects[0]); 
    176165          } 
    177166      } 
    178167    ]]></adhoc-task> 
    179168    <projectList projectDir="${stubbles.projects.path}"/> 
     169    <stubInitConfig configPath="${stubbles.projects.path}/${first.project}/config"/> 
     170    <stubInitClassLoader/> 
    180171    <foreach list="${projects}" param="stubbles.project" target="generate-client-project"/> 
    181172  </target> 
    …… 
    185176      <available file="${stubbles.projects.path}/${stubbles.project}/config/json-rpc-service.ini"/> 
    186177      <then> 
    187         <mkdir dir="${stubbles.projects.path}/${stubbles.project}/docroot/${jsonrpc.clients.dir}"/> 
    188178        <stubGenerateJsonRpcProxies serviceFile="${stubbles.projects.path}/${stubbles.project}/config/json-rpc-service.ini" 
    189179                                    docroot="${stubbles.projects.path}/${stubbles.project}/docroot"/>