]> granicus.if.org Git - php/commitdiff
implemented copy libs of core exts in phpize mode
authorAnatol Belski <ab@php.net>
Fri, 18 Jul 2014 16:38:57 +0000 (18:38 +0200)
committerAnatol Belski <ab@php.net>
Fri, 18 Jul 2014 16:38:57 +0000 (18:38 +0200)
win32/build/Makefile
win32/build/confutils.js

index e2d62545b8c782265c9b75c14960db178cd13f2c..53cb52adaf44fa347b0741010da11d67f18f2293 100644 (file)
@@ -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
 
index 3de57a9963e180ef3827c38f4dee9170fb355598..5a13494fc0903f99d5b0f8cae89e136685fb425b 100644 (file)
@@ -1952,8 +1952,18 @@ function generate_makefile()
                for (var i in extensions_enabled) {\r
                        var lib = "php_" + extensions_enabled[i][0] + ".lib";\r
                        var dll = "php_" + extensions_enabled[i][0] + ".dll";\r
-                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib\\" + lib);\r
-                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll);\r
+                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");\r
+                       MF.WriteLine("  @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");\r
+               }\r
+       } else {\r
+               MF.WriteBlankLines(1);\r
+               MF.WriteLine("build-ext-libs:");\r
+               for (var i in extensions_enabled) {\r
+                       var lib = "php_" + extensions_enabled[i][0] + ".lib";\r
+\r
+                       if ('shared' == extensions_enabled[i][1]) {\r
+                               MF.WriteLine("  @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");\r
+                       }\r
                }\r
        }\r
        TF.Close();\r