com php-src: implemented copy libs of core exts in phpize mode: win32/build/Makefile win32/build/confutils.js
| From: | Anatol Belski | Date: | Fri, 18 Jul 2014 16:38:57 +0000 |
| Subject: | com php-src: implemented copy libs of core exts in phpize mode: win32/build/Makefile win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79512@lists.php.net to get a copy of this message | ||
Commit: c5ccaf1d04fe20dc117b81764041c47efcb9b156
Author: Anatol Belski <ab@php.net> Fri, 18 Jul 2014 18:38:57 +0200
Parents: 35b077f53e0f8a1debc8bbacf1328b40c62099ab
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c5ccaf1d04fe20dc117b81764041c47efcb9b156
Log:
implemented copy libs of core exts in phpize mode
Changed paths:
M win32/build/Makefile
M win32/build/confutils.js
Diff:
diff --git a/win32/build/Makefile b/win32/build/Makefile
index e2d6254..53cb52a 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 3de57a9..5a13494 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();