Merge branch '3.7'

sebastianbergmann · Oct 11, 2012 · 6fd7f87 · 6fd7f87
2 parents ad32098 + 9bce0e0
commit 6fd7f87
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 40 deletions.
diff --git a/build.xml b/build.xml
@@ -170,53 +170,26 @@
 
   <exec executable="bash" outputproperty="version">
    <arg value="-c" />
-   <arg value="pear remote-info pear.phpunit.de/phpunit|grep Latest|sed 's/Latest      //g'" />
+   <arg value="${basedir}/phpunit.php --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
   </exec>
 
-  <exec executable="pear">
-   <arg value="config-set" />
-   <arg value="auto_discover" />
-   <arg value="1" />
-  </exec>
-
-  <exec executable="pear">
-   <arg value="install" />
-   <arg value="--force" />
-   <arg value="--alldeps" />
-   <arg value="--installroot" />
-   <arg path="${basedir}/build/phar" />
-   <arg value="pear.phpunit.de/PHPUnit" />
-   <arg value="pear.phpunit.de/PHPUnit_Selenium" />
-   <arg value="pear.phpunit.de/DbUnit" />
-  </exec>
-
-  <delete dir="${basedir}/build/phar/tmp"/>
-
-  <move todir="${basedir}/build/phar/File">
-   <fileset dir="${basedir}/build/phar/usr/local/php-5.4/lib/php/File"/>
-  </move>
-
-  <move todir="${basedir}/build/phar/PHP">
-   <fileset dir="${basedir}/build/phar/usr/local/php-5.4/lib/php/PHP"/>
-  </move>
-
-  <move todir="${basedir}/build/phar/PHPUnit">
-   <fileset dir="${basedir}/build/phar/usr/local/php-5.4/lib/php/PHPUnit"/>
-  </move>
-
-  <move todir="${basedir}/build/phar/Symfony">
-   <fileset dir="${basedir}/build/phar/usr/local/php-5.4/lib/php/Symfony"/>
-  </move>
-
-  <move todir="${basedir}/build/phar/Text">
-   <fileset dir="${basedir}/build/phar/usr/local/php-5.4/lib/php/Text"/>
-  </move>
+  <untar dest="${basedir}/build/phar" compression="gzip">
+   <fileset dir="${basedir}/build/dependencies">
+    <include name="**/*.tgz"/>
+   </fileset>
+  </untar>
 
-  <delete dir="${basedir}/build/phar/usr"/>
+  <copy todir="${basedir}/build/phar/PHPUnit">
+   <fileset dir="${basedir}/PHPUnit"/>
+  </copy>
 
   <delete>
    <fileset dir="${basedir}/build/phar">
+    <include name="**/autoload.php" />
     <include name="**/Autoload.php" />
+    <include name="**/Autoload.php.in" />
+    <include name="**/package.sig" />
+    <include name="**/package.xml" />
    </fileset>
   </delete>
 

diff --git a/build/dependencies/DbUnit-1.2.1.tgz b/build/dependencies/DbUnit-1.2.1.tgz
diff --git a/build/dependencies/File_Iterator-1.3.3.tgz b/build/dependencies/File_Iterator-1.3.3.tgz
diff --git a/build/dependencies/PHPUnit_MockObject-1.2.1.tgz b/build/dependencies/PHPUnit_MockObject-1.2.1.tgz
diff --git a/build/dependencies/PHPUnit_Selenium-1.2.9.tgz b/build/dependencies/PHPUnit_Selenium-1.2.9.tgz
diff --git a/build/dependencies/PHP_CodeCoverage-1.2.5.tgz b/build/dependencies/PHP_CodeCoverage-1.2.5.tgz
diff --git a/build/dependencies/PHP_Invoker-1.1.2.tgz b/build/dependencies/PHP_Invoker-1.1.2.tgz
diff --git a/build/dependencies/PHP_Timer-1.0.4.tgz b/build/dependencies/PHP_Timer-1.0.4.tgz
diff --git a/build/dependencies/PHP_TokenStream-1.1.5.tgz b/build/dependencies/PHP_TokenStream-1.1.5.tgz
diff --git a/build/dependencies/Text_Template-1.1.3.tgz b/build/dependencies/Text_Template-1.1.3.tgz
diff --git a/build/dependencies/Yaml-2.1.2.tgz b/build/dependencies/Yaml-2.1.2.tgz