diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-18 15:45:56 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-18 15:45:56 +0800 |
| commit | ba1cf321f301410cc5b3da61e106040187f1787b (patch) | |
| tree | 57e42e81cb0f0828e56bafea1759a9a483b13f04 /win32 | |
| parent | de433d4c4756e18515e4b394298f9e3e60009692 (diff) | |
| parent | 3e1b749f5e9e96245fc8801effa216d7f407867d (diff) | |
| download | php-git-ba1cf321f301410cc5b3da61e106040187f1787b.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/Makefile.phpize | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 25 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 4 |
3 files changed, 28 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 9b1e0fc891..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 {
@@ -1354,6 +1359,12 @@ 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;
+ }
+ 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") {
@@ -1952,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 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"));
|