Merge branch 'PHP-5.4' into PHP-5.5

weltling · weltling · commit 6fcd8e586509 · 2014-07-21T14:46:57.000+02:00
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1973,11 +1973,14 @@ function generate_makefile()
 	} else {
 		MF.WriteBlankLines(1);
 		MF.WriteLine("build-ext-libs:");
+		MF.WriteLine("	@if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");
 		for (var i in extensions_enabled) {
-			var lib = "php_" + extensions_enabled[i][0] + ".lib";
+			var lib;
+
+			lib = "php_" + extensions_enabled[i][0] + "*.lib";
 
 			if ('shared' == extensions_enabled[i][1]) {
-				MF.WriteLine("	@copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
+				MF.WriteLine("	@if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1973,11 +1973,14 @@ function generate_makefile()`
`1973`	`1973`	`} else {`
`1974`	`1974`	`MF.WriteBlankLines(1);`
`1975`	`1975`	`MF.WriteLine("build-ext-libs:");`
	`1976`	`+ MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");`
`1976`	`1977`	`for (var i in extensions_enabled) {`
`1977`		`- var lib = "php_" + extensions_enabled[i][0] + ".lib";`
	`1978`	`+ var lib;`
	`1979`	`+`
	`1980`	`+ lib = "php_" + extensions_enabled[i][0] + "*.lib";`
`1978`	`1981`
`1979`	`1982`	`if ('shared' == extensions_enabled[i][1]) {`
`1980`		`- MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
	`1983`	`+ MF.WriteLine(" @if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
`1981`	`1984`	`}`
`1982`	`1985`	`}`
`1983`	`1986`	`}`