Phing now builds with Pyrus.

build.xml

@@ -64,6 +64,14 @@ To print this message, do:
   <includepath classpath="../PhingDoxygen/src"/>
   <taskdef classname="PhingDoxygen.Task.DoxygenTask" name="doxygen"/>
 
+  <!-- Pyrus tasks. -->
+  <includepath classpath="/Users/mbutcher/Code"/> <!-- Pyrus is here. -->
+  <includepath classpath="../PhingPyrus/src"/>
+  <taskdef classname="PhingPyrus.Task.PyrusMakeTask" name="pyrusmake"/>
+  <taskdef classname="PhingPyrus.Task.PyrusPackageTask" name="pyruspackage"/>
+  <taskdef classname="PhingPyrus.Task.PyrusHelpTask" name="pyrushelp"/>
+  <taskdef classname="PhingPyrus.Task.PyrusExecTask" name="pyrusexec"/>
+
   <!-- Global properties -->
   <property name="srcdir" value="./src"/>
   <property name="testdir" value="./test"/>
@@ -73,6 +81,10 @@ To print this message, do:
   <property name="phardir" value="./phar"/>
   <property name="pearchannel" value="../pear.querypath.org/pear"/>
 
+  <!-- ported from PhingPyrus -->
+  <property name="pear.channel" value="pear.querypath.org"/>
+  <property name="projectname" value="QueryPath"/>
+
   <!-- Too hard to link to, nav is very difficult. -->
   <!-- property name="phpdoc.style" value="HTML:frames:phpedit"/ -->
 
@@ -88,6 +100,7 @@ To print this message, do:
     <include name="COPYING-MIT.txt"/>
     <include name="RELEASE"/>
     <include name="API"/>
+    <include name="CREDITS"/>
   </fileset>
 
   <!-- Files to be treated as source code -->
@@ -435,7 +448,7 @@ To print this message, do:
     <delete dir="${releasedir}" />
     <mkdir dir="${releasedir}"/>
     <mkdir dir="${releasedir}/doc"/>
-    <copy todir="${releasedir}">
+    <copy todir="${releasedir}/src">
       <filterchain>
         <!-- stripphpcomments/ -->
         <!-- stripwhitespace/ -->
@@ -445,6 +458,7 @@ To print this message, do:
       </filterchain>
       <fileset dir="${srcdir}">
         <include name="**/*"/>
+        <exclude name="**/documentation.php"/>
       </fileset>
     </copy>
     <copy todir="${releasedir}">
@@ -461,6 +475,11 @@ To print this message, do:
     <move file="${releasedir}/API" tofile="${releasedir}/API-${version}"/>
 
     <!-- Generate PEAR package. -->
+    <pyrusmake dir="${releasedir}" packagename="${projectname}" channel="${pear.channel}"/>
+    <pyruspackage packagexml="${releasedir}/package.xml"/>
+    <move file="${projectname}-${version}.tgz" tofile="${packagedir}/${projectname}-${version}.tgz"/>
+
+    <!--
     <pearpkg2 name="QueryPath" dir="./">
        <fileset dir="${releasedir}">
          <include name="**/**"/>
@@ -499,16 +518,19 @@ To print this message, do:
         </element>
        </mapping>
     </pearpkg2>
+    -->
 
     <!-- Copy the package.xml -->
-    <move file="${builddir}/package2.xml" tofile="${peardir}/package.xml"/>
+    <!-- move file="${builddir}/package2.xml" tofile="${peardir}/package.xml"/ -->
 
+    <!--
     <tar destfile="${packagedir}/QueryPath-${version}.tgz" compression="gzip">
       <fileset dir="./${peardir}">
         <include name="QueryPath-${version}/**/*"/>
         <include name="package.xml"/>
       </fileset>
     </tar>
+    -->
 
   </target>