svn: /pear2/Pyrus/trunk/ extrasetup.php

saltybeagle                              Wed, 26 May 2010 13:55:52 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=299787

Log:
Don't include trunk dir if we're building from a checkout of pear2/all.

Changed paths:
    U   pear2/Pyrus/trunk/extrasetup.php

Modified: pear2/Pyrus/trunk/extrasetup.php
===================================================================
--- pear2/Pyrus/trunk/extrasetup.php	2010-05-26 13:48:39 UTC (rev 299786)
+++ pear2/Pyrus/trunk/extrasetup.php	2010-05-26 13:55:52 UTC (rev 299787)
@@ -3,13 +3,16 @@
  * This file generates the pyrus.phar file and PEAR2 package for Pyrus.
  */
 $lib_path = __DIR__ . '/..';
+$xml_path = 'package.xml';
+
 if (basename(__DIR__) == 'trunk') {
     $lib_path .= '/..';
+    $xml_path = 'trunk/package.xml';
 }

 $extrafiles = array(
-    new \PEAR2\Pyrus\Package($lib_path . '/HTTP_Request/trunk/package.xml'),
-    new \PEAR2\Pyrus\Package($lib_path . '/sandbox/Console_CommandLine/trunk/package.xml'),
-    new \PEAR2\Pyrus\Package($lib_path . '/MultiErrors/trunk/package.xml'),
-    new \PEAR2\Pyrus\Package($lib_path . '/Exception/trunk/package.xml'),
+    new \PEAR2\Pyrus\Package($lib_path . '/HTTP_Request/'.$xml_path),
+    new \PEAR2\Pyrus\Package($lib_path . '/sandbox/Console_CommandLine/'.$xml_path),
+    new \PEAR2\Pyrus\Package($lib_path . '/MultiErrors/'.$xml_path),
+    new \PEAR2\Pyrus\Package($lib_path . '/Exception/'.$xml_path),
 );