merge from 3.0 branch till 1435.

1 files changed, 29 insertions, 24 deletions

diff --git a/build.xml b/build.xml
index 7da0b964..e0bb733f 100644
--- a/build.xml
+++ b/build.xml
@@ -85,6 +85,10 @@
     <exclude name="demos/blog/protected/Data/Blog.db" />
     <include name="demos/**/*"/>
   </fileset>
+

+  <fileset dir="." id="test-tools">

+    <include name="tests/test_tools/**/*"/>

+  </fileset>

 
   <!--
       Writable files and directories
@@ -105,11 +109,11 @@
               phing   &lt;target name&gt;
 
     where &lt;target name&gt; can be one of the following:
-    
+
     For all PRADO developers:
     - test    : run unit tests (results are under /build/test-reports);
     - js      : generate Javascript distribution files;
-    
+
     For PRADO release manager:
     - dist    : create release files;
     - build   : prepare a directory for distribution;
@@ -125,24 +129,25 @@
     <echo>Building pradolite.php...</echo>
     <delete file="framework/pradolite.php"/>
     <exec command="${php} build.php" dir="buildscripts/phpbuilder" passthru="true"/>
-    
+
     <echo>Copying files to build directory...</echo>
     <copy todir="${build.src.dir}">
       <fileset refid="demos"/>
       <fileset refid="docs"/>
       <fileset refid="framework"/>
-      <fileset refid="misc"/>
+      <fileset refid="misc"/>

+	  <fileset refid="test-tools" />
     </copy>
-    
+
     <copy file="buildscripts/classtree/DWExtensionReadme.txt" tofile="${build.src.dir}/editors/Dreamweaver/readme.txt" />
     <copy file="framework/pradolite.php" tofile="${build.src.dir}/framework/pradolite.php" />
     <copy file="framework/prado-cli.php" tofile="${build.src.dir}/framework/prado-cli.php" />
-    
+
     <echo>Changing file permissions...</echo>
     <chmod mode="0777">
       <fileset refid="writables" />
     </chmod>
-    
+
     <echo>Building quickstart demo search indices...</echo>
     <prado-quickstart-index todir="${build.src.dir}/demos/quickstart/protected/index/quickstart" />
   </target>
@@ -183,7 +188,7 @@
         <exec command="${hhc} ${build.doc.dir}/manual/CHMdefaultConverter/phpdoc.hhp" />
       </then>
     </if>
-    
+
     <echo>Indexing API manuals...</echo>
     <prado-api-index docdir="${build.doc.dir}/manual/HTMLSmartyConverter" todir="${build.doc.dir}/manual/HTMLSmartyConverter" />
     <copy file="buildscripts/index/search.php" todir="${build.doc.dir}/manual/HTMLSmartyConverter" />
@@ -204,7 +209,7 @@
         <move file="${build.doc.dir}/manual/CHMdefaultConverter/documentation.chm" tofile="${build.src.dir}/docs/manual.chm" />
       </then>
     </if>
-    
+
     <echo>Generating compressed distribution files...</echo>
     <if>
       <equals arg1="${prado.winbuild}" arg2="false"/>
@@ -216,11 +221,11 @@
     <exec command="zip ${pkgname}.zip -r ${pkgname}" dir="${build.base.dir}" />
     <move file="${build.base.dir}/${pkgname}.zip" todir="${build.dist.dir}" />
 
-	<echo>Generating files for pradosoft.com...</echo>    
+	<echo>Generating files for pradosoft.com...</echo>
     <echo>Compiling class docs...</echo>
     <exec command="${php} build.php" dir="buildscripts/classtree" passthru="true"/>
     <move file="buildscripts/classtree/classes.data" todir="${build.web.dir}/protected/Data" />
-    
+
     <echo>Moving HTML docs to Web folder...</echo>
     <mkdir dir="${build.web.dir}" />
     <move todir="${build.web.dir}/docs/manual">
@@ -228,26 +233,26 @@
         <include name="**/**" />
       </fileset>
     </move>
-    
+
     <echo>
-    
+
 
                    Distribution Not Completed Yet!!!
-                   
+
 The following steps need to be manually performed in order to complete
 the PRADO distribution:
 
 1. Package DreamWeaver extension by running DW extension manager with
    buildscripts/classtree/PRADO.mxi and saving the generated file as
    "${build.src.dir}/editors/Dreamweaver/PRADO.mxp"
-   
-2. If building on Linux, the CHM doc file needs to be generated by compiling 
+
+2. If building on Linux, the CHM doc file needs to be generated by compiling
    "${build.doc.dir}/manual/CHMdefaultConverter/phpdoc.hhp"
-   and saving the generated file as 
+   and saving the generated file as
    "${build.src.dir}/docs/manual.chm"
 
 3. Use winzip (on Windows) and gzip (on Linux) to generate the compressed
-   release files of the direcotry 
+   release files of the direcotry
    "${build.src.dir}".
 
     </echo>
@@ -272,7 +277,7 @@ the PRADO distribution:
     <phpunit2report infile="${build.test.dir}/unit-tests.xml" format="frames" styledir="buildscripts/phing/style" todir="${build.test.dir}"/>
   </target>
 
-  <target name="snapshot" depends="rebuild">  
+  <target name="snapshot" depends="rebuild">
     <echo>Generating compressed distribution files...</echo>
     <if>
       <equals arg1="${prado.winbuild}" arg2="false"/>
@@ -285,7 +290,7 @@ the PRADO distribution:
     <move file="${build.base.dir}/${pkgname}.zip" tofile="${build.snapshot.dir}/prado-latest.zip" />
     <copy file="${build.src.dir}/HISTORY" tofile="${build.snapshot.dir}/changelog-latest.txt" />
   </target>
-  
+
 <!--
   <taskdef name="phplint" classname="PhpLintTask" classpath="buildscripts/phing/tasks"/>
   <taskdef name="xmllint" classname="XmlLintTask" classpath="buildscripts/phing/tasks"/>
@@ -403,7 +408,7 @@ the PRADO distribution:
 	<include name="${prado.lite}"/>
       </fileset>
     </copy>
-    
+
     <echo>Creating package.xml...</echo>
     <pear-package dir="${build.pear.dir}" destFile="${build.base.dir}/pear/package.xml" version="${version}" state="${pear.state}" notes="${notes}">
       <fileset refid="framework"/>
@@ -427,9 +432,9 @@ the PRADO distribution:
   <target name="install" description="Install PEAR package locally">
     <exec command="sudo pear install ${dist.pearfile}" dir="." passthru="true"/>
   </target>
-  
+
   <target name="uninstall" description="Uninstall PEAR package locally">
-    <exec command="sudo pear uninstall pear.pradosoft.com/prado3" dir="." passthru="true"/>   
+    <exec command="sudo pear uninstall pear.pradosoft.com/prado3" dir="." passthru="true"/>
   </target>
--->  
+-->
 </project>