[PHP-WEBMASTER] com web/rmtools: fixed include subdirs for extension deps: client/include/PeclExt.php client/script/pecl.php

[Stephen A. Zarkos]

Commit:    4c20d33871ffe8fc16ea24124f69f077dc645a27
Author:    Anatol Belski <a...@php.net>         Sat, 31 Aug 2013 17:03:09 +0200
Parents:   7a1f065ebfe3fc943dfb563ad825ad88e7314878
Branches:  master

Link:       
http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=4c20d33871ffe8fc16ea24124f69f077dc645a27

Log:
fixed include subdirs for extension deps

Changed paths:
  M  client/include/PeclExt.php
  M  client/script/pecl.php


Diff:
diff --git a/client/include/PeclExt.php b/client/include/PeclExt.php
index d850981..0fa2b1e 100644
--- a/client/include/PeclExt.php
+++ b/client/include/PeclExt.php
@@ -146,15 +146,15 @@ class PeclExt
                                }
                                $extra_lib[] = $some_lib_path;  
 
-                               /* Many libs put headers into include and 
include/somelib, so lets cover both */
                                $some_lib_inc_path =  $lib_path . 
DIRECTORY_SEPARATOR . 'include';
                                if (!file_exists($some_lib_inc_path)) {
                                        throw new \Exception("Path 
'$some_lib_inc_path' doesn't exist");
                                }
-
                                $extra_inc[] = $some_lib_inc_path;      
-                               if (file_exists($some_lib_inc_path . 
DIRECTORY_SEPARATOR . $lib)) {
-                                       $extra_inc[] = $some_lib_inc_path . 
DIRECTORY_SEPARATOR . $lib; 
+
+                               $dirs = glob("$some_lib_inc_path/*", 
GLOB_ONLYDIR);
+                               foreach ($dirs as $dir) {
+                                       $extra_inc[] = $dir;
                                }
                        }
 
diff --git a/client/script/pecl.php b/client/script/pecl.php
index 8402fe8..27205f9 100644
--- a/client/script/pecl.php
+++ b/client/script/pecl.php
@@ -97,14 +97,13 @@ foreach ($builds as $build_name) {
                }
 
                if (!preg_match(',^\|\s+' . $ext->getName() . 
'\s+\|\s+shared\s+\|,Sm', $build->log_configure)) {
-                       throw new Exception($ext->getName() . 'is not enabled, 
skip make phase');
+                       throw new Exception($ext->getName() . ' is not enabled, 
skip make phase');
                }
 
                $build->make();
                //$html_make_log = $build->getMakeLogParsed();
        } catch (Exception $e) {
                echo $e->getMessage() . "\n";
-               echo $build->log_buildconf;
        }
 
        /* XXX PGO stuff would come here */
@@ -132,6 +131,8 @@ foreach ($builds as $build_name) {
        $build->clean();
        $ext->cleanup();
        /*rm\rmdir_rf($toupload_dir);*/
+
+       echo "\n";
 }
 
 echo "Done.\n";


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php