diff options
| author | Anatol Belski <ab@php.net> | 2014-07-17 21:48:46 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-17 21:48:46 +0200 |
| commit | b5324acd351b9b0c27bfee10d41aa579c1b442eb (patch) | |
| tree | e398c5a389e412688385d77c90aba0e114c8e0a2 /win32/build | |
| parent | 1a2c3bd3ad0463c5d0b0f6f86425a6be3e4807b6 (diff) | |
| parent | f0a1e410a3c23e6ac8c4d10a0218a3c40190b64a (diff) | |
| download | php-git-b5324acd351b9b0c27bfee10d41aa579c1b442eb.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented usage of the non core ext deps in phpize mode
Diffstat (limited to 'win32/build')
| -rw-r--r-- | win32/build/Makefile.phpize | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 22 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 1 |
3 files changed, 22 insertions, 3 deletions
diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index 44faf7d54b..1f92f7716c 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -34,5 +34,5 @@ _VC_MANIFEST_EMBED_EXE= if exist $@.manifest $(MT) -nologo -manifest $@.manifest _VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest -outputresource:$@;2
!endif
-install: build-headers
+install: build-headers build-bins
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index e55e727dad..c2c322b08c 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1201,9 +1201,14 @@ function ADD_EXTENSION_DEP(extname, dependson, optional) ERROR("static " + extname + " cannot depend on shared " + dependson);
}
- ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");
ADD_FLAG("LIBS_" + EXT, "php_" + dependson + ".lib");
- ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + dependson + ".lib");
+ if (MODE_PHPIZE) {
+ ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR_DEV)\\lib");
+ ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR_DEV)\\lib\\php_" + dependson + ".lib");
+ } else {
+ ADD_FLAG("LDFLAGS_" + EXT, "/libpath:$(BUILD_DIR)");
+ ADD_FLAG("DEPS_" + EXT, "$(BUILD_DIR)\\php_" + dependson + ".lib");
+ }
} else {
@@ -1357,6 +1362,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
cflags = "/FI main/config.pickle.h " + cflags;
}
+ 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") {
@@ -1955,6 +1963,16 @@ function generate_makefile() }
}
MF.WriteLine(" @for %D in ($(INSTALL_HEADERS_DIR)) do @copy %D*.h $(BUILD_DIR_DEV)\\include\\%D /y >nul");
+ if (MODE_PHPIZE) {
+ MF.WriteBlankLines(1);
+ MF.WriteLine("build-bins:");
+ for (var i in extensions_enabled) {
+ var lib = "php_" + extensions_enabled[i][0] + ".lib";
+ var dll = "php_" + extensions_enabled[i][0] + ".dll";
+ MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib\\" + lib);
+ //MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll);
+ }
+ }
TF.Close();
MF.WriteBlankLines(2);
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index a5c83bde01..3178804212 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -208,6 +208,7 @@ 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")) {
|