diff options
Diffstat (limited to 'win32/build/mkdist.php')
-rw-r--r-- | win32/build/mkdist.php | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php index f4969442b7..7a39bea02b 100644 --- a/win32/build/mkdist.php +++ b/win32/build/mkdist.php @@ -74,13 +74,13 @@ function get_depends($module) "api-ms-win-crt-.+\.dll", ); global $build_dir, $extra_dll_deps, $ext_targets, $sapi_targets, $pecl_targets, $phpdll, $per_module_deps, $pecl_dll_deps; - + $bd = strtolower(realpath($build_dir)); $is_pecl = in_array($module, $pecl_targets); - + $cmd = "$GLOBALS[build_dir]\\deplister.exe \"$module\" \"$GLOBALS[build_dir]\""; - $proc = proc_open($cmd, + $proc = proc_open($cmd, array(1 => array("pipe", "w")), $pipes); @@ -112,7 +112,7 @@ function get_depends($module) continue; } } - + if ($is_pecl) { if (!in_array($dep, $pecl_dll_deps)) { $pecl_dll_deps[] = $dep; @@ -209,7 +209,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ $hdr['size'] = octdec(trim($hdr['size'])); echo "File: $hdr[filename] $hdr[size]\n"; - + if ($filename == $hdr['filename']) { echo "Found the file we want\n"; $dest = fopen($destfilename, 'wb'); @@ -218,14 +218,14 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */ echo "Wrote $x bytes into $destfilename\n"; break; } - + /* skip body of the file */ $size = 512 * ceil((int)$hdr['size'] / 512); echo "Skipping $size bytes\n"; gzseek($fp, gztell($fp) + $size); - + } while (!$done); - + } /* }}} */ @@ -333,9 +333,9 @@ foreach ($extra_dll_deps as $dll) { } /* TODO: -add sanity check and test if all required DLLs are present, per version +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). -Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard +Add ADD_DLLS to add extra DLLs like dynamic dependencies for standard deps. For example, libenchant.dll loads libenchant_myspell.dll or libenchant_ispell.dll */ @@ -457,7 +457,7 @@ function copy_test_dir($directory, $dest) } } - closedir($directory_list); + closedir($directory_list); } function make_phar_dot_phar($dist_dir) @@ -543,7 +543,7 @@ if (!$use_pear_template) { extract_file_from_tarball('Archive_Tar', 'Archive/Tar.php', "$dist_dir/PEAR/go-pear-bundle"); extract_file_from_tarball('Console_Getopt', 'Console/Getopt.php', "$dist_dir/PEAR/go-pear-bundle"); } - + /* add extras from the template dir */ if (file_exists($snapshot_template)) { $items = glob("$snapshot_template/*"); @@ -573,7 +573,7 @@ if (file_exists($snapshot_template)) { } } } - + /* copy c++ runtime */ $items = glob("$snapshot_template/dlls/*.CRT"); |