Update from Kampbell/poco-1.9.1

build.gradle

@@ -150,7 +150,6 @@ File makePreBuildLibrary(String name, Platform platform) {
 	File pbl
 	if (platform.architecture.name == 'x86') {
 		pbl = new File(WDKHome + "/Lib/" + WDKVers + "/um/x86/" + name + ".lib")
-
 	} else
 	if (platform.architecture.name == 'x86-64') {
 		pbl = new File(WDKHome + "/Lib/" + WDKVers + "/um/x64/" + name + ".lib")
@@ -270,19 +269,19 @@ subprojects {
 						def libName = "foobar"
 						if (buildType == buildTypes.debug) {
 							if (targetPlatform.name == 'win32') {
-					            headers.srcDir "$openSSLWindowsHome/include"
+					            		headers.srcDir "$openSSLWindowsHome/include"
 								libName = 'libcryptod.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
 							} else if (targetPlatform.name == 'win64') {
-					            headers.srcDir "$openSSLWindowsHome/include"
+					            		headers.srcDir "$openSSLWindowsHome/include"
 								libName = 'libcryptod.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
-								libName = 'libcryptod.a'
+								headers.srcDir "$openSSLBrewHome/include"
+								libName = 'libcrypto.a'
 								staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								libName = 'libcrypto.a'
 								staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
 							}
@@ -295,11 +294,11 @@ subprojects {
 								libName = 'libcrypto.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
+								headers.srcDir "$openSSLBrewHome/include"
 								libName = 'libcrypto.a'
 								staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								libName = 'libcrypto.a'
 								staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
 							}
@@ -322,13 +321,13 @@ subprojects {
 								sharedLibraryFile	 = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
-								dllName = 'libcryptod.dylib'
-								linkName = 'libcryptod.dylib'
+								headers.srcDir "$openSSLBrewHome/include"
+								dllName = 'libcrypto.dylib'
+								linkName = 'libcrypto.dylib'
 								sharedLibraryFile	 = new File("$openSSLBrewHome/lib/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								dllName = 'libcrypto.so'
 								linkName = 'libcrypto.a'
 								sharedLibraryFile	 = new File("$openSSL64LinuxLib/$dllName")
@@ -347,13 +346,13 @@ subprojects {
 								sharedLibraryFile	 = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
+								headers.srcDir "$openSSLBrewHome/include"
 								dllName = 'libcrypto.dylib'
 								linkName = 'libcrypto.dylib'
 								sharedLibraryFile	 = new File("$openSSLBrewHome/lib/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								dllName = 'libcrypto.so'
 								linkName = 'libcrypto.a'
 								sharedLibraryFile	 = new File("$openSSL64LinuxLib/$dllName")
@@ -365,24 +364,23 @@ subprojects {
 					}
 				}
 				ssl {
-
 					binaries.withType(StaticLibraryBinary) {
 						def libName
 						if (buildType == buildTypes.debug) {
 							if (targetPlatform.name == 'win32') {
-					            headers.srcDir "$openSSLWindowsHome/include"
+					            		headers.srcDir "$openSSLWindowsHome/include"
 								libName = 'libssld.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
 							} else if (targetPlatform.name == 'win64') {
-					            headers.srcDir "$openSSLWindowsHome/include"
-								libName = 'libssld.lib'
+					            		headers.srcDir "$openSSLWindowsHome/include"
+								libName = 'libssl.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
-								libName = 'libssld.a'
+								headers.srcDir "$openSSLBrewHome/include"
+								libName = 'libssl.a'
 								staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								libName = 'libssl.a'
 								staticLibraryFile = new File("$openSSL64LinuxLib", "$libName")
 							}
@@ -395,11 +393,11 @@ subprojects {
 								libName = 'libssl.lib'
 								staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
+								headers.srcDir "$openSSLBrewHome/include"
 								libName = 'libssl.a'
 								staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								libName = 'libssl.a'
 								staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
 							}
@@ -422,14 +420,14 @@ subprojects {
 								sharedLibraryFile	 = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
-								dllName = 'libssld.dylib'
-								linkName = 'libssld.dylib'
+								headers.srcDir "$openSSLBrewHome/include"
+								dllName = 'libssl.dylib'
+								linkName = 'libssl.dylib'
 								sharedLibraryFile	 = new File("$openSSLBrewHome/lib/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
 							} else if (targetPlatform.operatingSystem.linux) {
-                                def File openSSL64LinuxLibFile = new File("$openSSL64LinuxLib")
-					            headers.srcDir "$openSSL64LinuxInc/include"
+                                				def File openSSL64LinuxLibFile = new File("$openSSL64LinuxLib")
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								dllName  = "libssl.so"
 								linkName = "libssl.a"
 								sharedLibraryFile	 = new File(openSSL64LinuxLibFile, dllName)
@@ -447,13 +445,13 @@ subprojects {
 								sharedLibraryFile	 = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
 							} else if (targetPlatform.operatingSystem.macOsX) {
-					            headers.srcDir "$openSSLBrewHome/include"
+								headers.srcDir "$openSSLBrewHome/include"
 								dllName = 'libssl.dylib'
 								linkName = 'libssl.dylib'
 								sharedLibraryFile	 = new File("$openSSLBrewHome/lib/$dllName")
 								sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
 							} else if (targetPlatform.operatingSystem.linux) {
-					            headers.srcDir "$openSSL64LinuxInc/include"
+					            		headers.srcDir "$openSSL64LinuxInc/include"
 								dllName = 'libssl.so'
 								linkName = 'libssl.a'
 								sharedLibraryFile	 = new File("$openSSL64LinuxLib/$dllName")
@@ -836,7 +834,7 @@ CXX=g++
 CXXFLAGS=-std=c++11
 """
 	} else 
-    if (os.macos) {
+    if (os.macOsX) {
 	}
 }
 task pocoDoc(type: Exec) {
@@ -858,6 +856,7 @@ task pocoDoc(type: Exec) {
 	}
 	if (os.macOsX) {
 		//FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH"
+		executable "PocoDoc/bin64/PocoDoc"
 		args "--config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
 		args "--config=$rootDir/PocoDoc/PocoDoc.ini"
 	}