cvs: php-src(PHP_5_3) /win32/build mkdist.php

pajoye Tue Aug 5 11:47:17 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/build mkdist.php Log: - MFH: add dll path to mkdist default path http://cvs.php.net/viewvc.cgi/php-src/win32/build/mkdist.php?r1=1.13.4.1.2.1&r2=1.13.4.1.2.2&diff_format=u Index: php-src/win32/build/mkdist.php diff -u php-src/win32/build/mkdist.php:1.13.4.1.2.1 php-src/win32/build/mkdist.php:1.13.4.1.2.2 --- php-src/win32/build/mkdist.php:1.13.4.1.2.1 Fri Apr 11 21:57:58 2008 +++ php-src/win32/build/mkdist.php Tue Aug 5 11:47:17 2008 @@ -1,4 +1,4 @@ -<?php # $Id: mkdist.php,v 1.13.4.1.2.1 2008/04/11 21:57:58 bjori Exp $ +<?php # $Id: mkdist.php,v 1.13.4.1.2.2 2008/08/05 11:47:17 pajoye Exp $ /* piece together a windows binary distro */ $build_dir = $argv[1]; @@ -30,7 +30,7 @@ { static $no_dist = array( /* windows system dlls that should not be bundled */ - 'advapi32.dll', 'comdlg32.dll', 'gdi32.dll', 'kernel32.dll', 'ntdll.dll', + 'advapi32.dll', 'comdlg32.dll', 'crypt32.dll', 'gdi32.dll', 'kernel32.dll', 'ntdll.dll', 'odbc32.dll', 'ole32.dll', 'oleaut32.dll', 'rpcrt4.dll', 'shell32.dll', 'shlwapi.dll', 'user32.dll', 'ws2_32.dll', 'ws2help.dll', 'comctl32.dll', 'winmm.dll', 'wsock32.dll', 'winspool.drv', 'msasn1.dll', @@ -40,7 +40,7 @@ 'apachecore.dll', /* apache 2 */ - 'libhttpd.dll', 'libapr.dll', 'libaprutil.dll', + 'libhttpd.dll', 'libapr.dll', 'libaprutil.dll','libapr-1.dll', 'libaprutil-1.dll', /* pi3web */ 'piapi.dll', 'pi3api.dll', @@ -284,8 +284,11 @@ /* try template dir */ $tdll = $snapshot_template . "/dlls/" . basename($dll); if (!file_exists($tdll)) { - echo "WARNING: distro depends on $dll, but could not find it on your system\n"; - continue; + $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; + } } $dll = $tdll; }