From e9e205b45a97f1c93597a827bb7d421a4673a499 Mon Sep 17 00:00:00 2001
From: Vasil Rangelov <boen.robot@gmail.com>
Date: Fri, 3 Aug 2012 01:42:04 +0300
Subject: [PATCH] Made extrasetup.php mode flexible.

---
 extrasetup.php      | 28 ++++++++++++++++++++++++----
 packagexmlsetup.php |  1 +
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/extrasetup.php b/extrasetup.php
index d53f865..f71477b 100644
--- a/extrasetup.php
+++ b/extrasetup.php
@@ -1,8 +1,28 @@
 <?php
 $extrafiles = array();
+
 $phpDir = Pyrus\Config::current()->php_dir . DIRECTORY_SEPARATOR;
+$packages = array('PEAR2/Autoload');
 
-$PEAR2_Autoload_Path = 'PEAR2/Autoload.php';
-$extrafiles = array(
-    'src/' . $PEAR2_Autoload_Path => $phpDir . $PEAR2_Autoload_Path
-);
\ No newline at end of file
+foreach ($packages as $pkg) {
+    $prefix = $phpDir . $pkg;
+    
+    if (is_dir($prefix)) {
+        foreach (
+            new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator(
+                    $prefix,
+                    RecursiveDirectoryIterator::UNIX_PATHS
+                ),
+                RecursiveIteratorIterator::LEAVES_ONLY
+            ) as $path
+        ) {
+            $pathname = $path->getPathname();
+            $extrafiles['src/' . $pathname] = $pathname;
+        }
+    }
+    
+    if (is_file($prefix . '.php')) {
+        $extrafiles['src/' . $pkg . '.php'] = $prefix . '.php';
+    }
+}
\ No newline at end of file
diff --git a/packagexmlsetup.php b/packagexmlsetup.php
index 2fcdcec..7d9b8e4 100644
--- a/packagexmlsetup.php
+++ b/packagexmlsetup.php
@@ -115,6 +115,7 @@
         $package->files[$filename] = array_merge_recursive(
             $package->files[$filename]->getArrayCopy(), $srcFileTasks
         );
+        
         if ($hasCompatible) {
             $compatibleFilename = str_replace('src/', 'php/', $filename);
             $compatible->files[$compatibleFilename] = array_merge_recursive(