mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-24 00:57:06 +02:00
Switch to new File("
This commit is contained in:
parent
b6e0014124
commit
1ca75df208
138
build.gradle
138
build.gradle
@ -256,7 +256,7 @@ subprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
libs(PrebuiltLibraries) {
|
libs(PrebuiltLibraries) {
|
||||||
WS2_32 {
|
WS2_32 {
|
||||||
headers.srcDir = new File("$WDKHome" + "/Include/" + "$WDKVers" + "/um/x86")
|
headers.srcDir new File("$WDKHome" + "/Include/" + "$WDKVers" + "/um/x86")
|
||||||
binaries.withType(StaticLibraryBinary) {
|
binaries.withType(StaticLibraryBinary) {
|
||||||
if (targetPlatform.operatingSystem.windows) {
|
if (targetPlatform.operatingSystem.windows) {
|
||||||
staticLibraryFile = makePreBuildLibrary("WS2_32", targetPlatform)
|
staticLibraryFile = makePreBuildLibrary("WS2_32", targetPlatform)
|
||||||
@ -269,38 +269,38 @@ subprojects {
|
|||||||
def libName = "foobar"
|
def libName = "foobar"
|
||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir = new File("$openSSLWindowsHome/include")
|
headers.srcDir new File("$openSSLWindowsHome/include")
|
||||||
libName = 'libcryptod.lib'
|
libName = 'libcryptod.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir = new File("$openSSLWindowsHome/include")
|
headers.srcDir new File("$openSSLWindowsHome/include")
|
||||||
libName = 'libcryptod.lib'
|
libName = 'libcryptod.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
|
staticLibraryFile new File("$openSSL64LinuxLib/$libName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
libName = 'libcrypto.lib'
|
libName = 'libcrypto.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/release/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win32/lib/release/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
libName = 'libcrypto.lib'
|
libName = 'libcrypto.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
|
staticLibraryFile new File("$openSSL64LinuxLib/$libName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@ -313,50 +313,50 @@ subprojects {
|
|||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libcryptod.dll'
|
dllName = 'libcryptod.dll'
|
||||||
linkName = 'libcryptod.lib'
|
linkName = 'libcryptod.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win32/bin/debug/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win32/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
dllName = 'libcryptod.dll'
|
dllName = 'libcryptod.dll'
|
||||||
linkName = 'libcryptod.lib'
|
linkName = 'libcryptod.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
dllName = 'libcrypto.dylib'
|
dllName = 'libcrypto.dylib'
|
||||||
linkName = 'libcrypto.dylib'
|
linkName = 'libcrypto.dylib'
|
||||||
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
dllName = 'libcrypto.so'
|
dllName = 'libcrypto.so'
|
||||||
linkName = 'libcrypto.a'
|
linkName = 'libcrypto.a'
|
||||||
sharedLibraryFile = new File("$openSSL64LinuxLib/$dllName")
|
sharedLibraryFile new File("$openSSL64LinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSL64LinuxLib/$linkName")
|
sharedLibraryLinkFile new File("$openSSL64LinuxLib/$linkName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libcrypto.dll'
|
dllName = 'libcrypto.dll'
|
||||||
linkName = 'libcrypto.lib'
|
linkName = 'libcrypto.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win32/bin/release/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win32/bin/release/$linkName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
dllName = 'libcrypto.dll'
|
dllName = 'libcrypto.dll'
|
||||||
linkName = 'libcrypto.lib'
|
linkName = 'libcrypto.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
dllName = 'libcrypto.dylib'
|
dllName = 'libcrypto.dylib'
|
||||||
linkName = 'libcrypto.dylib'
|
linkName = 'libcrypto.dylib'
|
||||||
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
dllName = 'libcrypto.so'
|
dllName = 'libcrypto.so'
|
||||||
linkName = 'libcrypto.a'
|
linkName = 'libcrypto.a'
|
||||||
sharedLibraryFile = new File("$openSSL64LinuxLib/$dllName")
|
sharedLibraryFile new File("$openSSL64LinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSL64LinuxLib/$linkName")
|
sharedLibraryLinkFile new File("$openSSL64LinuxLib/$linkName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@ -368,38 +368,38 @@ subprojects {
|
|||||||
def libName
|
def libName
|
||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir = new File("$openSSLWindowsHome/include")
|
headers.srcDir new File("$openSSLWindowsHome/include")
|
||||||
libName = 'libssld.lib'
|
libName = 'libssld.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir = new File("$openSSLWindowsHome/include")
|
headers.srcDir new File("$openSSLWindowsHome/include")
|
||||||
libName = 'libssl.lib'
|
libName = 'libssl.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = new File("$openSSL64LinuxLib", "$libName")
|
staticLibraryFile new File("$openSSL64LinuxLib", "$libName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
libName = 'libssl.lib'
|
libName = 'libssl.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/release/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win32/lib/release/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
libName = 'libssl.lib'
|
libName = 'libssl.lib'
|
||||||
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
staticLibraryFile new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = new File("$openSSL64LinuxLib/$libName")
|
staticLibraryFile new File("$openSSL64LinuxLib/$libName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@ -412,48 +412,48 @@ subprojects {
|
|||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libssld.dll'
|
dllName = 'libssld.dll'
|
||||||
linkName = 'libssld.lib'
|
linkName = 'libssld.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win32/bin/debug/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win32/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
dllName = 'libssld.dll'
|
dllName = 'libssld.dll'
|
||||||
linkName = 'libssld.lib'
|
linkName = 'libssld.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
dllName = 'libssl.dylib'
|
dllName = 'libssl.dylib'
|
||||||
linkName = 'libssl.dylib'
|
linkName = 'libssl.dylib'
|
||||||
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
dllName = "libssl.so"
|
dllName = "libssl.so"
|
||||||
linkName = "libssl.a"
|
linkName = "libssl.a"
|
||||||
sharedLibraryFile = new File("$openSSL64LinuxLib", dllName)
|
sharedLibraryFile new File("$openSSL64LinuxLib", dllName)
|
||||||
sharedLibraryLinkFile = new File("$openSSL64LinuxLib", linkName)
|
sharedLibraryLinkFile new File("$openSSL64LinuxLib", linkName)
|
||||||
}
|
}
|
||||||
} else if (buildType == buildTypes.release) {
|
} else if (buildType == buildTypes.release) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libssl.dll'
|
dllName = 'libssl.dll'
|
||||||
linkName = 'libssl.lib'
|
linkName = 'libssl.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win32/bin/release/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win32/bin/release/$linkName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
dllName = 'libssl.dll'
|
dllName = 'libssl.dll'
|
||||||
linkName = 'libssl.lib'
|
linkName = 'libssl.lib'
|
||||||
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
sharedLibraryFile new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
sharedLibraryLinkFile new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir = new File("$openSSLBrewHome/include")
|
headers.srcDir new File("$openSSLBrewHome/include")
|
||||||
dllName = 'libssl.dylib'
|
dllName = 'libssl.dylib'
|
||||||
linkName = 'libssl.dylib'
|
linkName = 'libssl.dylib'
|
||||||
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir = new File("$openSSL64LinuxInc/include")
|
headers.srcDir new File("$openSSL64LinuxInc/include")
|
||||||
dllName = 'libssl.so'
|
dllName = 'libssl.so'
|
||||||
linkName = 'libssl.a'
|
linkName = 'libssl.a'
|
||||||
sharedLibraryFile = new File("$openSSL64LinuxLib/$dllName")
|
sharedLibraryFile new File("$openSSL64LinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$openSSL64LinuxLib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSL64LinuxLib/$linkName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -959,7 +959,7 @@ def report(os, Directory, Module) {
|
|||||||
args "-targetdir:coverage/${Module}"
|
args "-targetdir:coverage/${Module}"
|
||||||
// args "-sourcedirs:XML/src;XML/include;CppUnit/src;CppUnit/include;Foundation/src;Foundation/include"
|
// args "-sourcedirs:XML/src;XML/include;CppUnit/src;CppUnit/include;Foundation/src;Foundation/include"
|
||||||
|
|
||||||
File targetDir = new File("coverage/${Module}")
|
File targetnew File("le("coverage/${Module}")
|
||||||
inputs.files(new File(targetDir,"${Module}TestSuite.xml"))
|
inputs.files(new File(targetDir,"${Module}TestSuite.xml"))
|
||||||
|
|
||||||
onlyIf(new Spec<Exec>() {
|
onlyIf(new Spec<Exec>() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user