com php-src: mkdist.php: recursively check dll dependencies: win32/build/mkdist.php
| From: | Anatol Belski | Date: | Thu, 23 Aug 2018 19:25:54 +0000 |
| Subject: | com php-src: mkdist.php: recursively check dll dependencies: win32/build/mkdist.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102884@lists.php.net to get a copy of this message | ||
Commit: b9bf9ddce6b0813df60b346fca7919735f158cd5
Author: Dylan K. Taylor <odigiman@gmail.com> Tue, 21 Aug 2018 15:23:02 +0100
Committer: Anatol Belski <ab@php.net> Thu, 23 Aug 2018 21:25:54 +0200
Parents: 6644bd005f94993d9e479c02ab1acd650e1181a8
Branches: PHP-7.1 PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b9bf9ddce6b0813df60b346fca7919735f158cd5
Log:
mkdist.php: recursively check dll dependencies
Fix duplication of recursively checked deps
Changed paths:
M win32/build/mkdist.php
Diff:
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index a8ae758..de328e0 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -122,7 +122,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'),