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

saltybeagle                              Sun, 23 May 2010 19:37:44 +0000

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

Log:
Minor simplification

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

Modified: pear2/Pyrus/trunk/extrasetup.php
===================================================================
--- pear2/Pyrus/trunk/extrasetup.php	2010-05-23 19:37:08 UTC (rev 299668)
+++ pear2/Pyrus/trunk/extrasetup.php	2010-05-23 19:37:44 UTC (rev 299669)
@@ -2,18 +2,14 @@
 /**
  * This file generates the pyrus.phar file and PEAR2 package for Pyrus.
  */
+$lib_path = __DIR__ . '/..';
 if (basename(__DIR__) == 'trunk') {
-    $extrafiles = array(
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../../HTTP_Request/trunk/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../../sandbox/Console_CommandLine/trunk/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../../MultiErrors/trunk/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../../Exception/trunk/package.xml'),
-    );
-} else {
-    $extrafiles = array(
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../HTTP_Request/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../sandbox/Console_CommandLine/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../MultiErrors/package.xml'),
-        new \PEAR2\Pyrus\Package(__DIR__ . '/../Exception/package.xml'),
-    );
+    $lib_path .= '/..';
 }
+
+$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'),
+);