diff options
| author | Anatol Belski <ab@php.net> | 2014-10-08 11:39:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-08 11:39:54 +0200 |
| commit | fe42847799c9fab9476ca6399e25ed0da0cb2d5c (patch) | |
| tree | 8d5f7f1dc7d13e1377fce8f42fba92334b45da6f | |
| parent | 9af9f874c7370bc57564846f333677fac5bed020 (diff) | |
| parent | db6cc049ada28899a3b2fd70f84e452c29ca5abe (diff) | |
| download | php-git-fe42847799c9fab9476ca6399e25ed0da0cb2d5c.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
let phpize profit from /mp as well
fix phpize for /mp and more
fix /mp usage for VC++
fix wording
| -rw-r--r-- | win32/build/config.w32 | 5 | ||||
| -rw-r--r-- | win32/build/config.w32.phpize.in | 5 | ||||
| -rw-r--r-- | win32/build/confutils.js | 4 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 5 |
4 files changed, 15 insertions, 4 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index fd3c6cfa08..54fadc09b3 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -166,14 +166,17 @@ if (VCVERS >= 1400) { } } -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/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 878e48d02b..9b28352c8f 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/confutils.js b/win32/build/confutils.js index ae668fee26..a394c52ad9 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1429,7 +1429,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) obj = src.replace(re, ".obj");
tv += " " + sub_build + obj;
- if (!MODE_PHPIZE && PHP_ONE_SHOT == "yes") {
+ if (!PHP_MP_DISABLED) {
if (i > 0) {
objs_line += " " + sub_build + obj;
srcs_line += " " + dir + "\\" + src;
@@ -1448,7 +1448,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir) }
}
- if (!MODE_PHPIZE && PHP_ONE_SHOT == "yes") {
+ if (!PHP_MP_DISABLED) {
MFO.WriteLine(objs_line + ": " + srcs_line);
MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) /Fo" + sub_build + " $(" + bd_flags_name + ") /c " + srcs_line);
}
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index b0ba0bbb82..1302cf7065 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"));
|