From a8e0a623ecdfa90027570faa921001a65092310f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 18 Jul 2014 11:35:32 +0200 Subject: fix file with zero size usage in phpize mode --- win32/build/phpize.js.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'win32') diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 3178804212..c99dece618 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -40,9 +40,13 @@ function ERROR(msg) function file_get_contents(filename) { + var t = ""; var F = FSO.OpenTextFile(filename, 1); - var t = F.ReadAll(); - F.Close(); + + if (!F.AtEndOfStream) { + t = F.ReadAll(); + F.Close(); + } return t; } -- cgit v1.2.1 From 8044d0680ba03a08b5d4daa61e6b0b20d1ac30c0 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 18 Jul 2014 11:36:44 +0200 Subject: fix default prefix in phpize mode --- win32/build/config.w32.phpize.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'win32') diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index b8bf45ea57..a544aac85c 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -105,6 +105,11 @@ if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") { ERROR("Use of both --enable-debug and --enable-debug-pack not allowed."); } +if (PHP_PREFIX == '') { + PHP_PREFIX = "C:\\php"; + if (PHP_DEBUG == "yes") + PHP_PREFIX += "\\debug"; +} DEFINE('PHP_PREFIX', PHP_PREFIX); DEFINE("BASE_INCLUDES", "/I " + PHP_DIR + "/include /I " + PHP_DIR + "/include/main /I " + PHP_DIR + "/include/Zend /I " + PHP_DIR + "/include/TSRM /I " + PHP_DIR + "/include/ext "); -- cgit v1.2.1 From 35b077f53e0f8a1debc8bbacf1328b40c62099ab Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 18 Jul 2014 11:39:38 +0200 Subject: fix copy the ext dll into the prefix path in phpize mode --- win32/build/confutils.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'win32') diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1c61316fb9..3de57a9963 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1347,9 +1347,6 @@ 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") { @@ -1869,6 +1866,7 @@ function generate_phpize() var MF = FSO.CreateTextFile(dest + "/phpize.js", true); var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true); + prefix = get_define("PHP_PREFIX"); prefix = prefix.replace(new RegExp("/", "g"), "\\"); prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\"); @@ -1955,7 +1953,7 @@ function generate_makefile() 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); + MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll); } } TF.Close(); -- cgit v1.2.1 From c5ccaf1d04fe20dc117b81764041c47efcb9b156 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 18 Jul 2014 18:38:57 +0200 Subject: implemented copy libs of core exts in phpize mode --- win32/build/Makefile | 2 +- win32/build/confutils.js | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/build/Makefile b/win32/build/Makefile index e2d62545b8..53cb52adaf 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -183,7 +183,7 @@ msi-installer: dist # need to redirect, since INSTALL is a file in the root... install: really-install install-sdk -build-lib: +build-lib: build-ext-libs @if not exist $(BUILD_DIR_DEV)\lib mkdir $(BUILD_DIR_DEV)\lib >nul @copy $(BUILD_DIR)\$(PHPLIB) $(BUILD_DIR_DEV)\lib /y >nul diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 3de57a9963..5a13494fc0 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1952,8 +1952,18 @@ function generate_makefile() 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); + MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib"); + MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)"); + } + } else { + MF.WriteBlankLines(1); + MF.WriteLine("build-ext-libs:"); + for (var i in extensions_enabled) { + var lib = "php_" + extensions_enabled[i][0] + ".lib"; + + if ('shared' == extensions_enabled[i][1]) { + MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib"); + } } } TF.Close(); -- cgit v1.2.1