com php-src: force ext_dep.js prepend to configure. js in phpize mode: win32/build/confutils.js w in32/build/phpize.js.in

Commit: 1f90dd3359df540842ba29d0b3eb087195669b36 Author: Anatol Belski <ab@php.net> Thu, 10 Jul 2014 21:50:37 +0200 Parents: e7f36ba6935d187cbe0be642f5b5104238c83785 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f90dd3359df540842ba29d0b3eb087195669b36 Log: force ext_dep.js prepend to configure.js in phpize mode Changed paths: M win32/build/confutils.js M win32/build/phpize.js.in Diff: diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 7202b4d..ce844dc 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1168,11 +1168,6 @@ function ADD_EXTENSION_DEP(extname, dependson, optional) var dep_present = false; var dep_shared = false; - if (MODE_PHPIZE) { - ext_deps_js = file_get_contents(PHP_DIR + "\\script\\ext_deps.js"); - eval(ext_deps_js); - } - try { dep_present = eval("PHP_" + DEP); diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 4813ec0..235c081 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -209,6 +209,8 @@ C.WriteLine("/* This file automatically generated from script/confutils.js */"); C.WriteLine("var MODE_PHPIZE = true;"); C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"'); +C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js")); + C.Write(file_get_contents(PHP_DIR + "/script/confutils.js")); C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));