Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
This commit is contained in:
Anatol Belski 2015-03-17 09:22:11 +01:00
commit 56b0ff0e5d

View File

@ -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 */