com php-src: Fixed bug #65406 Enchant broker plugins are in the wrong place in windows: NEWS win32/build/mkdist.php

Commit: 0f18a15e89e78ba42e87a3ee52d456de6a016044 Author: Anatol Belski <ab@php.net> Tue, 17 Mar 2015 09:20:16 +0100 Parents: 4dba99c226b5142228689a75ce13936cee49e8ae Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f18a15e89e78ba42e87a3ee52d456de6a016044 Log: Fixed bug #65406 Enchant broker plugins are in the wrong place in windows Bugs: https://bugs.php.net/65406 Changed paths: M NEWS M win32/build/mkdist.php Diff: diff --git a/NEWS b/NEWS index 46a1102..3a8bbad 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,10 @@ PHP NEWS . Fixed bug #69221 (Segmentation fault when using a generator in combination with an Iterator). (Nikita) +- Enchant: + . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows + builds). (Anatol) + - Filter: . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used). (Jeff Welch) diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index 640e9b3..9e4422a 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -322,13 +322,24 @@ foreach (glob($ICU_DLLS) as $filename) { copy($filename, "$dist_dir/" . basename($filename)); } $ENCHANT_DLLS = array( - 'glib-2.dll', - 'gmodule-2.dll', - 'libenchant_myspell.dll', - 'libenchant_ispell.dll', + array('', 'glib-2.dll'), + array('', 'gmodule-2.dll'), + array('lib/enchant', 'libenchant_myspell.dll'), + array('lib/enchant', 'libenchant_ispell.dll'), ); -foreach ($ENCHANT_DLLS as $filename) { - copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" . basename($filename)); +foreach ($ENCHANT_DLLS as $dll) { + $dest = "$dist_dir/$dll[0]"; + $filename = $dll[1]; + + if (!file_exists("$dest") || !is_dir("$dest")) { + if (!mkdir("$dest", 0777, true)) { + echo "WARNING: couldn't create '$dest' for enchant plugins "; + } + } + + if (!copy($php_build_dir . '/bin/' . $filename, "$dest/" . basename($filename))) { + echo "WARNING: couldn't copy $filename into the dist dir"; + } } /* and those for pecl */