com php-src: implemented force usage of generated .h and .js deps in phpize mode: win32/build/confutils.js win32/build/phpize.js.in

Commit: b3c608911143d75c5edb5fc57259c3de4c0a00a3 Author: Anatol Belski <ab@php.net> Thu, 17 Jul 2014 09:25:57 +0200 Parents: ce2ad0df180f09a52e255535f3a74558eb01e9a2 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b3c608911143d75c5edb5fc57259c3de4c0a00a3 Log: implemented force usage of generated .h and .js deps 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 419d0ba..2bc72ee 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1339,6 +1339,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')'); } + if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) { + cflags = "/FI main/config.pickle.h " + cflags; + } ADD_FLAG("CFLAGS_" + EXT, cflags); if (PHP_DSP != "no") { diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 235c081..a5c83bd 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -210,6 +210,9 @@ 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")); +if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) { + C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js")); +} C.Write(file_get_contents(PHP_DIR + "/script/confutils.js")); C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));