Changeset 1153

Show
Ignore:
Timestamp:
12/14/07 17:55:17 (1 year ago)
Author:
mikey
Message:

moved phing tasks from info::phing to org::stubbles::phing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/stubbles-ioc/build.xml

    r1128 r1153  
    11<?xml version="1.0"?> 
    2 <project name="stubbles" basedir="." default="main"> 
    3   <property name="build.base.dir" value="${project.basedir}/build" /> 
    4   <property name="pkg.dir" value="${project.basedir}/../../src/main/php/net/stubbles" /> 
     2<project name="stubbles-ioc" default="main"> 
     3  <property name="build.base.dir" value="${stubbles.base.dir}/build/stubbles-ioc/build" override="true"/> 
     4  <property name="pkg.dir" value="${stubbles.base.dir}/src/main/php/net/stubbles" /> 
    55  <property name="pkg.name" value="stubbles-${version}"/> 
    66  <property name="build.src.dir" value="${build.base.dir}/${pkg.name}"/> 
    7   <taskDef name="mySimpletest" classname="MySimpleTestTask" classpath="${project.basedir}/../../src/test" /> 
    8   <taskDef name="minifyJs" classname="stubJsMinTask" classpath="${project.basedir}/../../src/main/php/info/phing/tasks" /> 
    9   <taskDef name="checkStyle" classname="stubCheckStyleTask" classpath="${project.basedir}/../../src/main/php/info/phing/tasks" /> 
    10   <taskDef name="buildStar" classname="stubStarWriterTask" classpath="${project.basedir}/../../src/main/php/info/phing/tasks" /> 
    11   <typedef name="starDecorator" classname="StarDecorator" classpath="${project.basedir}/../../src/main/php/info/phing/types" /> 
     7   
     8  <path id="phing.tasks.classpath"> 
     9    <pathelement dir="${stubbles.base.dir}/src/main/php/org/stubbles/phing/tasks"/> 
     10  </path> 
     11   
     12  <taskdef name="mySimpletest" classname="MySimpleTestTask" classpath="${stubbles.base.dir}/src/test" /> 
     13  <taskdef name="minifyJs" classname="stubJsMinTask" classpathref="phing.tasks.classpath" /> 
     14  <taskdef name="checkStyle" classname="stubCheckStyleTask" classpathref="phing.tasks.classpath" /> 
     15  <taskdef name="buildStar" classname="stubStarWriterTask" classpathref="phing.tasks.classpath" /> 
     16  <typedef name="starDecorator" classname="StarDecorator" classpath="${stubbles.base.dir}/src/main/php/org/stubbles/phing/types" /> 
    1217 
    1318  <target name="main" if="version" depends="check-style,build"/> 
    …… 
    3439    <echo>-----------------------------</echo> 
    3540    <delete dir="${build.src.dir}"/> 
    36     <copy file="${project.basedir}/../../LICENSE" tofile="${build.src.dir}/LICENSE" /> 
     41    <copy file="${stubbles.base.dir}/LICENSE" tofile="${build.src.dir}/LICENSE" /> 
    3742    <append destFile="${build.src.dir}/VERSION">Stubbles Inversion of Control version ${version}</append> 
    3843 
    …… 
    4247    <mkdir dir="${build.src.dir}/config" /> 
    4348    <mkdir dir="${build.src.dir}/config/php" /> 
    44     <copy file="${project.basedir}/../../config/php/config-dist.php" tofile="${build.src.dir}/config/php/config-dist.php" /> 
     49    <copy file="${stubbles.base.dir}/config/php/config-dist.php" tofile="${build.src.dir}/config/php/config-dist.php" /> 
    4550  </target> 
    4651 
    …… 
    5156    <echo message="Base directory  : ${project.basedir}"/> 
    5257    <echo message="Source directory: ${build.src.dir}"/> 
    53     <php expression="file_get_contents('${project.basedir}/../../src/main/php/net/stubbles/stubClassLoader.php')" returnProperty="stubClassLoader"/> 
     58    <php expression="file_get_contents('${stubbles.base.dir}/src/main/php/net/stubbles/stubClassLoader.php')" returnProperty="stubClassLoader"/> 
    5459    <buildStar buildPath="${build.src.dir}/lib/stubbles-ioc.php" 
    5560         version="${version}" 
    …… 
    5964         copyright="Stubbles Development Team" 
    6065         preface="&lt;?php require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; ?&gt;${stubClassLoader}" 
    61          baseSrcPath="${project.basedir}/../../src/main"> 
    62       <fileset dir="${project.basedir}/../../src/main"> 
     66         baseSrcPath="${stubbles.base.dir}/src/main"> 
     67      <fileset dir="${stubbles.base.dir}/src/main"> 
    6368        <include name="**/net/stubbles/lang/**/*.php" /> 
    6469        <include name="**/net/stubbles/ioc/**/*.php" /> 
    6570        <include name="**/net/stubbles/reflection/**/*.php" /> 
    66         <include name="**/net/stubbles/star/**/*.php" /> 
     71        <include name="**/net/stubbles/star/StarClassRegistry.php" /> 
    6772      </fileset> 
    6873    </buildStar> 
    …… 
    8590  <target name="test" description="run test suite"> 
    8691    <phingcall target="test-preparation" /> 
    87     <mySimpletest testfile="&quot;${project.basedir}/../../src/test/run.php&quot;" exit="true" /> 
     92    <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/run.php&quot;" exit="true" /> 
    8893    <!-- run two times, this time with the data cached --> 
    89     <mySimpletest testfile="&quot;${project.basedir}/../../src/test/run.php&quot;" exit="true" /> 
     94    <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/run.php&quot;" exit="true" /> 
    9095  </target> 
    9196 
    9297  <target name="test-integration"> 
    9398    <phingcall target="test-preparation" /> 
    94     <mySimpletest testfile="&quot;${project.basedir}/../../src/test/runIntegration.php&quot;" exit="true" /> 
     99    <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/runIntegration.php&quot;" exit="true" /> 
    95100    <!-- run two times, this time with the data cached --> 
    96     <mySimpletest testfile="&quot;${project.basedir}/../../src/test/runIntegration.php&quot;" exit="true" /> 
     101    <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/runIntegration.php&quot;" exit="true" /> 
    97102  </target> 
    98103 
    99104  <target name="test-preparation" description="Some preparations before running the tests."> 
    100     <delete file="${project.basedir}/../../lib/.cache" verbose="true"/> 
     105    <delete file="${stubbles.base.dir}/lib/.cache" verbose="true"/> 
    101106    <delete> 
    102       <fileset dir="${project.basedir}/../../cache"> 
     107      <fileset dir="${stubbles.base.dir}/cache"> 
    103108        <include name="**/*.cache" /> 
    104109      </fileset> 
    …… 
    111116    <echo>----------------------------------</echo> 
    112117    <checkStyle failonerror="true"> 
    113       <fileset dir="${project.basedir}/../../src/main"> 
     118      <fileset dir="${stubbles.base.dir}/src/main"> 
    114119        <include name="**/net/stubbles/lang/**/*.php" /> 
    115120        <include name="**/net/stubbles/ioc/**/*.php" /> 
    116121        <include name="**/net/stubbles/reflection/**/*.php" /> 
    117         <include name="**/net/stubbles/star/**/*.php" /> 
    118122      </fileset> 
    119123    </checkStyle> 

  • trunk/build/stubbles/build.xml

    r1133 r1153  
    77   
    88  <path id="phing.tasks.classpath"> 
    9     <pathelement dir="${stubbles.base.dir}/src/main/php/info/phing/tasks"/> 
     9    <pathelement dir="${stubbles.base.dir}/src/main/php/org/stubbles/phing/tasks"/> 
    1010  </path> 
    1111   
    …… 
    1414  <taskdef name="checkStyle" classname="stubCheckStyleTask" classpathref="phing.tasks.classpath" /> 
    1515  <taskdef name="buildStar" classname="stubStarWriterTask" classpathref="phing.tasks.classpath" /> 
    16   <typedef name="starDecorator" classname="StarDecorator" classpath="${stubbles.base.dir}/src/main/php/info/phing/types" /> 
     16  <typedef name="starDecorator" classname="StarDecorator" classpath="${stubbles.base.dir}/src/main/php/org/stubbles/phing/types" /> 
    1717 
    1818  <target name="main" if="version" depends="check-style,test,test-integration,build"/> 
    …… 
    9292    <echo>| Setting up build system   |</echo> 
    9393    <echo>-----------------------------</echo> 
    94     <mkdir dir="${build.src.dir}/src/main/php/info" /> 
    95     <mkdir dir="${build.src.dir}/src/main/php/info/phing" /> 
    96     <mkdir dir="${build.src.dir}/src/main/php/info/phing/tasks" /> 
    97     <mkdir dir="${build.src.dir}/src/main/php/info/phing/types" /> 
    98     <copy todir="${build.src.dir}/src/main/php/info/phing/tasks"> 
    99       <fileset dir="${stubbles.base.dir}/src/main/php/info/phing/tasks/"> 
     94    <mkdir dir="${build.src.dir}/src/main/php/org" /> 
     95    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles" /> 
     96    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles/phing" /> 
     97    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles/phing/tasks" /> 
     98    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles/phing/types" /> 
     99    <copy todir="${build.src.dir}/src/main/php/org/stubbles/phing/tasks"> 
     100      <fileset dir="${stubbles.base.dir}/src/main/php/org/stubbles/phing/tasks/"> 
    100101        <include name="stubInitTask.php"/> 
    101102        <include name="stubGenerateJsonRpcProxiesTask.php"/> 

  • trunk/build/vfs/build.xml

    r1148 r1153  
    77   
    88  <path id="phing.tasks.classpath"> 
    9     <pathelement dir="${stubbles.base.dir}/src/main/php/info/phing/tasks"/> 
     9    <pathelement dir="${stubbles.base.dir}/src/main/php/org/stubbles/phing/tasks"/> 
    1010  </path> 
    1111   
    …… 
    2626    <input propertyname="version" promptChar=":">version</input> 
    2727 
    28     <property name="pkg.name" value="stubbles-vfs-${version}" override="true"/> 
     28    <property name="pkg.name" value="vfsStream-${version}" override="true"/> 
    2929    <property name="build.src.dir" value="${build.base.dir}/${pkg.name}" override="true"/> 
    3030  </target> 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubCheckStyleTask.php

    r677 r1153  
    55 * @author      Stephan Schmidt <schst@stubbles.net> 
    66 * @package     stubbles 
    7  * @subpackage  phing 
     7 * @subpackage  phing_tasks 
    88 */ 
    99 
    …… 
    1818 * @author      Stephan Schmidt <schst@stubbles.net> 
    1919 * @package     stubbles 
    20  * @subpackage  phing 
     20 * @subpackage  phing_tasks 
    2121 * 
    2222 * @todo        Use PEAR::PHP_CodeSniffer to be able to not only check for tabs. 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubGenerateJsonRpcProxiesTask.php

    r943 r1153  
    55 * @author      Stephan Schmidt <schst@stubbles.net> 
    66 * @package     stubbles 
    7  * @subpackage  phing 
     7 * @subpackage  phing_tasks 
    88 */ 
    99 
    …… 
    1818 * @author      Stephan Schmidt <schst@stubbles.net> 
    1919 * @package     stubbles 
    20  * @subpackage  phing 
     20 * @subpackage  phing_tasks 
    2121 */ 
    2222class stubGenerateJsonRpcProxiesTask extends Task 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubGenerateRewriteRulesTask.php

    r1074 r1153  
    55 * @author      Richard Sternagel <richard.sternagel@1und1.de> 
    66 * @package     stubbles 
    7  * @subpackage  phing 
     7 * @subpackage  phing_tasks 
    88 */ 
    99require_once 'phing/Task.php'; 
    …… 
    1212 * 
    1313 * @package     stubbles 
    14  * @subpackage  phing 
     14 * @subpackage  phing_tasks 
    1515 */ 
    1616class stubGenerateRewriteRulesTask extends Task 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubInitTask.php

    r586 r1153  
    66 * @author      Frank Kleine <mikey@stubbles.net> 
    77 * @package     stubbles 
    8  * @subpackage  phing 
     8 * @subpackage  phing_tasks 
    99 */ 
    1010 
    …… 
    1717 * 
    1818 * @package     stubbles 
    19  * @subpackage  phing 
     19 * @subpackage  phing_tasks 
    2020 */ 
    2121class stubInitTask extends Task 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubJsMinTask.php

    r984 r1153  
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    66 * @package     stubbles 
    7  * @subpackage  phing 
     7 * @subpackage  phing_tasks 
    88 */ 
    99/** 
    …… 
    1515 * 
    1616 * @package     stubbles 
    17  * @subpackage  phing 
     17 * @subpackage  phing_tasks 
    1818 */ 
    1919class stubJsMinTask extends Task 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubStarWriterTask.php

    r1133 r1153  
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    66 * @package     stubbles 
    7  * @subpackage  phing 
     7 * @subpackage  phing_tasks 
    88 */ 
    99/** 
    …… 
    2323 * 
    2424 * @package     stubbles 
    25  * @subpackage  phing 
     25 * @subpackage  phing_tasks 
    2626 */ 
    2727class stubStarWriterTask extends Task 

  • trunk/src/main/php/org/stubbles/phing/types/StarDecorator.php

    r610 r1153  
    44 *  
    55 * @author      Frank Kleine 
    6  * @package     phing 
    7  * @subpackage  types 
     6 * @package     stubbles 
     7 * @subpackage  phing_types 
    88 */ 
    99require_once 'phing/types/DataType.php'; 
    …… 
    1111 * This type represents a list of decorators for star files. 
    1212 *  
    13  * @package     phing 
    14  * @subpackage  types 
     13 * @package     stubbles 
     14 * @subpackage  phing_types 
    1515 */ 
    1616class StarDecorator extends DataType 

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

    r1134 r1153  
    11<?xml version="1.0"?> 
    22<project name="Stubbles" basedir="." default="main"> 
    3   <property name="phing.task.dir" value="${project.basedir}/src/main/php/info/phing/tasks" /> 
     3  <property name="phing.task.dir" value="${project.basedir}/src/main/php/org/stubbles/phing/tasks" /> 
    44  <property name="processors.default.file" value="config/xml/processors.xml" /> 
    55  <property name="processors.dist.file" value="config/xml/processors-dist.xml" />