do not add .phar files to .phar

diff --git a/build.xml b/build.xml
index 8d18b1c6f824c50d4e3544dc7eddfbe25f58e011..6c9fc2243c7a75158e0b870143df6944a22917f8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,6 @@
  <property name="libdir" value="${phing.dir}/lib"/>
 
  <fileset id="fs.phar" dir="${phing.dir}">
  <property name="libdir" value="${phing.dir}/lib"/>
 
  <fileset id="fs.phar" dir="${phing.dir}">

-<!---->

   <include name="data/**"/>
   <include name="lib/**"/>
   <include name="src/**"/>
   <include name="data/**"/>
   <include name="lib/**"/>
   <include name="src/**"/>


@@ -17,8 +16,7 @@
 
   <exclude name="data/phancap.config.php"/>
   <exclude name="www/imgcache/"/>
 
   <exclude name="data/phancap.config.php"/>
   <exclude name="www/imgcache/"/>

-<!--
-  <include name="www/index.php"/> -->
+  <exclude name="www/*.phar"/>

  </fileset>
 
  <typedef name="pearPackageFileSet" classname="phing.types.PearPackageFileSet" />
  </fileset>
 
  <typedef name="pearPackageFileSet" classname="phing.types.PearPackageFileSet" />


@@ -31,16 +29,15 @@
   <pharpackage basedir="${phing.dir}"
    destfile="${pharfile}"
    stub="${phing.dir}/src/phar-stub.php"
   <pharpackage basedir="${phing.dir}"
    destfile="${pharfile}"
    stub="${phing.dir}/src/phar-stub.php"

-   alias="test.phar"
+   alias="phancap.phar"

   >
    <fileset refid="fs.phar"/>
   </pharpackage>
   >
    <fileset refid="fs.phar"/>
   </pharpackage>

-  <!--
+

   <exec executable="bzip2" dir="${phing.dir}/dist">
    <arg value="-kf"/>
    <arg file="${pharfile}"/>
   </exec>
   <exec executable="bzip2" dir="${phing.dir}/dist">
    <arg value="-kf"/>
    <arg file="${pharfile}"/>
   </exec>

-  -->

  </target>
 
 
  </target>