pajoye Tue Aug 26 09:10:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build mkdist.php
Log:
- support for copy of ICU DLLS for all ICU versions
http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.3&r2=1.13.4.1.2.4&diff_format=u
Index: php-src/win32/build/mkdist.php
diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.3
php-src/win32/build/mkdist.php:1.13.4.1.2.4
--- php-src/win32/build/mkdist.php:1.13.4.1.2.3 Wed Aug 20 20:09:13 2008
+++ php-src/win32/build/mkdist.php Tue Aug 26 09:10:39 2008
@@ -1,4 +1,4 @@
-<?php # $Id: mkdist.php,v 1.13.4.1.2.3 2008/08/20 20:09:13 pajoye Exp $
+<?php # $Id: mkdist.php,v 1.13.4.1.2.4 2008/08/26 09:10:39 pajoye Exp $
/* piece together a windows binary distro */
$build_dir = $argv[1];
@@ -58,7 +58,7 @@
* but the debug version (msvcrtd.dll) and those from visual
studio.net
* (msvcrt7x.dll) are not */
'msvcrt.dll',
-
+ 'wldap32.dll'
);
global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets,
$pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps;
@@ -295,22 +295,13 @@
copy($dll, "$dist_dir/" . basename($dll));
}
-$ICU_DLLS = array(
- 'icudt36.dll',
- 'icuin36.dll',
- 'icuio36.dll',
- 'icule36.dll',
- 'iculx36.dll',
- 'icutu36.dll',
- 'icuuc36.dll'
-);
-foreach ($ICU_DLLS as $dll) {
- $tdll = '../deps/bin/' . basename($dll);
- if (!file_exists($tdll)) {
- echo "WARNING: distro depends on $dll, but could not find it on
your system\n";
- continue;
- }
- copy($tdll, "$dist_dir/" . basename($dll));
+/* TODO:
+add sanity check and test if all required DLLs are present, per version
+This version works at least for 3.6, 3.8 and 4.0 (5.3-vc6, 5.3-vc9 and HEAD).
+*/
+$ICU_DLLS = '../deps/bin/' . 'icudt*.dll';
+foreach (glob($ICU_DLLS) as $filename) {
+ copy($filename, "$dist_dir/" . basename($dll));
}
/* and those for pecl */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
