com php-src: fix copy the ext dll into the prefix path in phpize mode: win32/build/confutils.js
| From: | Anatol Belski | Date: | Fri, 18 Jul 2014 09:39:38 +0000 |
| Subject: | com php-src: fix copy the ext dll into the prefix path in phpize mode: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79507@lists.php.net to get a copy of this message | ||
Commit: 35b077f53e0f8a1debc8bbacf1328b40c62099ab
Author: Anatol Belski <ab@php.net> Fri, 18 Jul 2014 11:39:38 +0200
Parents: 8044d0680ba03a08b5d4daa61e6b0b20d1ac30c0
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=35b077f53e0f8a1debc8bbacf1328b40c62099ab
Log:
fix copy the ext dll into the prefix path in phpize mode
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1c61316..3de57a9 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();