com php-src: fix phpize for /mp and more: win32/build/config.w32.phpize.in win32/build/phpize.js.in

Commit: 9a3af83ee2aecff25fd4922ef67c1fb4d2af6201 Author: Anatol Belski <ab@php.net> Wed, 8 Oct 2014 11:01:15 +0200 Parents: 892efcfc3dcc4d869d00e3628c3aa5116fe2c7ab Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a3af83ee2aecff25fd4922ef67c1fb4d2af6201 Log: fix phpize for /mp and more Changed paths: M win32/build/config.w32.phpize.in M win32/build/phpize.js.in Diff: diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 878e48d..9b28352 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -151,14 +151,17 @@ if (VCVERS >= 1400) { } ARG_WITH('prefix', 'PHP installation prefix', ''); -ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto'); +ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto'); +var PHP_MP_DISABLED = true; if (VCVERS >= 1500 && PHP_MP != 'disable') { // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { ADD_FLAG('CFLAGS', ' /MP '); + PHP_MP_DISABLED = false; } else { if(parseInt(PHP_MP) != 0) { ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' '); + PHP_MP_DISABLED = false; } else { STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP); } diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index b0ba0bb..1302cf7 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -213,6 +213,11 @@ C.WriteLine("var MODE_PHPIZE = true;"); C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"'); C.WriteLine("var PHP_PREFIX = " + '"' + PHP_PREFIX.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"'); +/* XXX this needs to be implemented for the phpize mode yet, a quick fix just to disable it for now */ +C.WriteLine("var PHP_ANALYZER = 'disabled';"); +C.WriteLine("var PHP_PGO = 'no';"); +C.WriteLine("var PHP_PGI = 'no';"); + C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js")); if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) { C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));