diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-18 15:52:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-18 16:25:43 +0800 |
| commit | 110bf9c720d02b49a1a5d0c6e8affe65f9aa01db (patch) | |
| tree | 9d377d071e33efcbbc3c60f3218a557216edfd71 /win32/build/phpize.js.in | |
| parent | 4e378844abbfbc7fec88d063ee0bf2e9026b6b6a (diff) | |
| parent | f6f621ef69a5a9bf20e94c2714bdebae73860927 (diff) | |
| download | php-git-110bf9c720d02b49a1a5d0c6e8affe65f9aa01db.tar.gz | |
Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
Diffstat (limited to 'win32/build/phpize.js.in')
| -rw-r--r-- | win32/build/phpize.js.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 235c0816a3..3178804212 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -208,8 +208,12 @@ STDOUT.WriteLine(PHP_DIR); 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.WriteLine("var PHP_PREFIX = " + '"' + PHP_PREFIX.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"));
|