Merge branch 'PHP-5.6'

weltling · weltling · commit b39f98cf81cc · 2014-07-21T14:48:06.000+02:00
* PHP-5.6:
  fix nmake snap when ext name is different in target dll
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1994,11 +1994,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
`@@ -1994,11 +1994,14 @@ function generate_makefile()`
`1994`	`1994`	`} else {`
`1995`	`1995`	`MF.WriteBlankLines(1);`
`1996`	`1996`	`MF.WriteLine("build-ext-libs:");`
	`1997`	`+ MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");`
`1997`	`1998`	`for (var i in extensions_enabled) {`
`1998`		`- var lib = "php_" + extensions_enabled[i][0] + ".lib";`
	`1999`	`+ var lib;`
	`2000`	`+`
	`2001`	`+ lib = "php_" + extensions_enabled[i][0] + "*.lib";`
`1999`	`2002`
`2000`	`2003`	`if ('shared' == extensions_enabled[i][1]) {`
`2001`		`- MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
	`2004`	`+ MF.WriteLine(" @if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
`2002`	`2005`	`}`
`2003`	`2006`	`}`
`2004`	`2007`	`}`