diff options
| author | Anatol Belski <ab@php.net> | 2018-08-23 21:26:40 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-08-23 21:26:40 +0200 |
| commit | 8f43ec1e8326126e863bf6611ef68e2f01cd26a9 (patch) | |
| tree | 76e8d4727f57b570547708d22b326bf9aab3b65b | |
| parent | 1c3d5659bd5e5c1a3be8ad04b5b7cb2d615e3e42 (diff) | |
| parent | b9bf9ddce6b0813df60b346fca7919735f158cd5 (diff) | |
| download | php-git-8f43ec1e8326126e863bf6611ef68e2f01cd26a9.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
mkdist.php: recursively check dll dependencies
| -rw-r--r-- | win32/build/mkdist.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 804fcf7585..f4969442b7 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -123,7 +123,11 @@ function get_depends($module) } } - $per_module_deps[basename($module)][] = $dep; + if (!isset($per_module_deps[basename($module)]) || !in_array($dep, $per_module_deps[basename($module)])) { + $per_module_deps[basename($module)][] = $dep; + //recursively check dll dependencies + get_depends($dep); + } } fclose($pipes[1]); proc_close($proc); @@ -335,10 +339,6 @@ Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard deps. For example, libenchant.dll loads libenchant_myspell.dll or libenchant_ispell.dll */ -$ICU_DLLS = $php_build_dir . '/bin/icu*.dll'; -foreach (glob($ICU_DLLS) as $filename) { - copy($filename, "$dist_dir/" . basename($filename)); -} $ENCHANT_DLLS = array( array('', 'glib-2.dll'), array('', 'gmodule-2.dll'), |