archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed bug #65406 Enchant broker plugins are in the wrong place in windows

Browse source
This commit is contained in:
Anatol Belski 2015-03-17 09:20:16 +01:00
parent 4dba99c226
commit 0f18a15e89
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -13,6 +13,10 @@ PHP NEWS
. Fixed bug #69221 (Segmentation fault when using a generator in combination . Fixed bug #69221 (Segmentation fault when using a generator in combination
with an Iterator). (Nikita) with an Iterator). (Nikita)
- Enchant:
. Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
builds). (Anatol)
- Filter: - Filter:
. Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
flags are used). (Jeff Welch) flags are used). (Jeff Welch)

23
win32/build/mkdist.php
View file

@ -322,13 +322,24 @@ foreach (glob($ICU_DLLS) as $filename) {
copy($filename, "$dist_dir/" . basename($filename)); copy($filename, "$dist_dir/" . basename($filename));
} }
$ENCHANT_DLLS = array( $ENCHANT_DLLS = array(
'glib-2.dll', array('', 'glib-2.dll'),
'gmodule-2.dll', array('', 'gmodule-2.dll'),
'libenchant_myspell.dll', array('lib/enchant', 'libenchant_myspell.dll'),
'libenchant_ispell.dll', array('lib/enchant', 'libenchant_ispell.dll'),
); );
foreach ($ENCHANT_DLLS as $filename) { foreach ($ENCHANT_DLLS as $dll) {
copy($php_build_dir . '/bin/' . $filename, "$dist_dir/" . basename($filename)); $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 */ /* and those for pecl */