mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-10 17:43:47 +02:00
Update gradle
This commit is contained in:
@@ -7,22 +7,22 @@ model {
|
|||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
libName = 'libmysqld.lib'
|
libName = 'libmysqld.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir new File("$mysql32Home/include")
|
||||||
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir new File("$mysql64Home/include")
|
||||||
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (buildType == buildTypes.release) {
|
if (buildType == buildTypes.release) {
|
||||||
libName = 'libmysql.lib'
|
libName = 'libmysql.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir new File("$mysql32Home/include")
|
||||||
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
staticLibraryFile = new File("$mysql32Home/lib/$libName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir new File("$mysql64Home/include")
|
||||||
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
staticLibraryFile = new File("$mysql64Home/lib/$libName")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,12 +34,12 @@ model {
|
|||||||
dllName = 'libmysqld.dll'
|
dllName = 'libmysqld.dll'
|
||||||
linkName = 'libmysqld.lib'
|
linkName = 'libmysqld.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir new File("$mysql32Home/include")
|
||||||
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir new File("$mysql64Home/include")
|
||||||
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
||||||
}
|
}
|
||||||
@@ -48,12 +48,12 @@ model {
|
|||||||
dllName = 'libmysql.dll'
|
dllName = 'libmysql.dll'
|
||||||
linkName = 'libmysql.lib'
|
linkName = 'libmysql.lib'
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$mysql32Home/include"
|
headers.srcDir new File("$mysql32Home/include")
|
||||||
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
|
||||||
} else
|
} else
|
||||||
if (targetPlatform.name == 'win64') {
|
if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$mysql64Home/include"
|
headers.srcDir new File("$mysql64Home/include")
|
||||||
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
sharedLibraryFile = new File("$mysql64Home/lib/$dllName")
|
||||||
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
|
||||||
}
|
}
|
||||||
@@ -73,7 +73,7 @@ model {
|
|||||||
exportedHeaders {
|
exportedHeaders {
|
||||||
srcDir 'include'
|
srcDir 'include'
|
||||||
}
|
}
|
||||||
lib library: 'mysql'
|
// lib library: 'mysql'
|
||||||
lib project: ':Data', library: 'Data'
|
lib project: ':Data', library: 'Data'
|
||||||
lib project: ':Foundation', library: 'Foundation'
|
lib project: ':Foundation', library: 'Foundation'
|
||||||
}
|
}
|
||||||
@@ -83,10 +83,26 @@ model {
|
|||||||
binaries {
|
binaries {
|
||||||
all {
|
all {
|
||||||
cppCompiler.define "THREADSAFE"
|
cppCompiler.define "THREADSAFE"
|
||||||
cppCompiler.define "__LCC__"
|
|
||||||
if (toolChain in VisualCpp) {
|
if (toolChain in VisualCpp) {
|
||||||
cppCompiler.define "WINVER=0x0600"
|
cppCompiler.define "WINVER=0x0600"
|
||||||
|
cppCompiler.define "__LCC__"
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
|
||||||
|
INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
|
||||||
|
SYSFLAGS += -DTHREADSAFE -DNO_TCL
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (toolChain in Gcc) {
|
||||||
|
def String LIB64SUFFIX = "64"
|
||||||
|
cppCompiler.define "NO_TCL"
|
||||||
|
cppCompiler.args ( "-I", "/usr/local/include/mysql/" )
|
||||||
|
cppCompiler.args ( "-I", "/usr/include/mysql/" )
|
||||||
|
cppCompiler.args ( "-I", "/usr/mysql/include/mysql" )
|
||||||
|
cppCompiler.args ( "-I", "/usr/local/mysql/include" )
|
||||||
|
linker.args "-L/usr/local/lib$LIB64SUFFIX/mysql -L/usr/lib$LIB64SUFFIX/mysql -L/usr/mysql/lib$LIB64SUFFIX -L/usr/mysql/lib$LIB64SUFFIX/mysql -L/usr/local/mysql/lib$LIB64SUFFIX -lmysqlclient"
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
withType(SharedLibraryBinarySpec) {
|
withType(SharedLibraryBinarySpec) {
|
||||||
if (toolChain in VisualCpp) {
|
if (toolChain in VisualCpp) {
|
||||||
|
@@ -82,5 +82,3 @@ model {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
task poco { dependsOn "assemble" }
|
task poco { dependsOn "assemble" }
|
||||||
|
|
||||||
|
|
||||||
|
128
build.gradle
128
build.gradle
@@ -272,37 +272,37 @@ 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 "$openSSLWinHome/include"
|
headers.srcDir "$openSSLWindowsHome/include"
|
||||||
libName = 'libcryptod.lib'
|
libName = 'libcryptod.lib'
|
||||||
staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$openSSLWinHome/include"
|
headers.srcDir "$openSSLWindowsHome/include"
|
||||||
libName = 'libcryptod.lib'
|
libName = 'libcryptod.lib'
|
||||||
staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
headers.srcDir "$openSSLBrewHome/include"
|
headers.srcDir "$openSSLBrewHome/include"
|
||||||
libName = 'libcryptod.a'
|
libName = 'libcryptod.a'
|
||||||
staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = file("$openSSLLinuxLib/$libName")
|
staticLibraryFile = new File("$openSSLLinuxLib/$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 = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/lib/release/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
libName = 'libcrypto.a'
|
libName = 'libcrypto.a'
|
||||||
staticLibraryFile = file("$openSSLLinuxLib/$libName")
|
staticLibraryFile = new File("$openSSLLinuxLib/$libName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@@ -315,48 +315,48 @@ subprojects {
|
|||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libcryptod.dll'
|
dllName = 'libcryptod.dll'
|
||||||
linkName = 'libcryptod.lib'
|
linkName = 'libcryptod.lib'
|
||||||
sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/bin/debug/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
dllName = 'libcryptod.dylib'
|
dllName = 'libcryptod.dylib'
|
||||||
linkName = 'libcryptod.dylib'
|
linkName = 'libcryptod.dylib'
|
||||||
sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
dllName = 'libcrypto.so'
|
dllName = 'libcrypto.so'
|
||||||
linkName = 'libcrypto.a'
|
linkName = 'libcrypto.a'
|
||||||
sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
|
sharedLibraryFile = new File("$openSSLLinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLLinuxLib/$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 = file("$openSSLWinHome/win32/bin/release/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/bin/release/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
dllName = 'libcrypto.dylib'
|
dllName = 'libcrypto.dylib'
|
||||||
linkName = 'libcrypto.dylib'
|
linkName = 'libcrypto.dylib'
|
||||||
sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
dllName = 'libcrypto.so'
|
dllName = 'libcrypto.so'
|
||||||
linkName = 'libcrypto.a'
|
linkName = 'libcrypto.a'
|
||||||
sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
|
sharedLibraryFile = new File("$openSSLLinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLLinuxLib/$linkName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@@ -369,36 +369,36 @@ subprojects {
|
|||||||
def libName
|
def libName
|
||||||
if (buildType == buildTypes.debug) {
|
if (buildType == buildTypes.debug) {
|
||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
headers.srcDir "$openSSLWinHome/include"
|
headers.srcDir "$openSSLWindowsHome/include"
|
||||||
libName = 'libssld.lib'
|
libName = 'libssld.lib'
|
||||||
staticLibraryFile = file("$openSSLWinHome/win32/lib/debug/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win32/lib/debug/$libName")
|
||||||
} else if (targetPlatform.name == 'win64') {
|
} else if (targetPlatform.name == 'win64') {
|
||||||
headers.srcDir "$openSSLWinHome/include"
|
headers.srcDir "$openSSLWindowsHome/include"
|
||||||
libName = 'libssld.lib'
|
libName = 'libssld.lib'
|
||||||
staticLibraryFile = file("$openSSLWinHome/win64/lib/debug/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/debug/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
libName = 'libssld.a'
|
libName = 'libssld.a'
|
||||||
staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = file("$openSSLLinuxLib/$libName")
|
staticLibraryFile = new File("$openSSLLinuxLib", "$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 = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/lib/release/$libName")
|
staticLibraryFile = new File("$openSSLWindowsHome/win64/lib/release/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = file("$openSSLBrewHome/lib/$libName")
|
staticLibraryFile = new File("$openSSLBrewHome/lib/$libName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
libName = 'libssl.a'
|
libName = 'libssl.a'
|
||||||
staticLibraryFile = file("$openSSLLinuxLib/$libName")
|
staticLibraryFile = new File("$openSSLLinuxLib/$libName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@@ -411,47 +411,48 @@ subprojects {
|
|||||||
if (targetPlatform.name == 'win32') {
|
if (targetPlatform.name == 'win32') {
|
||||||
dllName = 'libssld.dll'
|
dllName = 'libssld.dll'
|
||||||
linkName = 'libssld.lib'
|
linkName = 'libssld.lib'
|
||||||
sharedLibraryFile = file("$openSSLWinHome/win32/bin/debug/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/bin/debug/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/debug/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/debug/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/debug/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
dllName = 'libssld.dylib'
|
dllName = 'libssld.dylib'
|
||||||
linkName = 'libssld.dylib'
|
linkName = 'libssld.dylib'
|
||||||
sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
|
def File openSSLLinuxLibFile = new File("$openSSLLinuxLib")
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
dllName = 'libssl.so'
|
dllName = "libssl.so"
|
||||||
linkName = 'libssl.a'
|
linkName = "libssl.a"
|
||||||
sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
|
sharedLibraryFile = new File(openSSLLinuxLibFile, dllName)
|
||||||
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
|
sharedLibraryLinkFile = new File(openSSLLinuxLibFile, 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 = file("$openSSLWinHome/win32/bin/release/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win32/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/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 = file("$openSSLWinHome/win64/bin/release/$dllName")
|
sharedLibraryFile = new File("$openSSLWindowsHome/win64/bin/release/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLWinHome/win64/bin/release/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLWindowsHome/win64/bin/release/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.macOsX) {
|
} else if (targetPlatform.operatingSystem.macOsX) {
|
||||||
dllName = 'libssl.dylib'
|
dllName = 'libssl.dylib'
|
||||||
linkName = 'libssl.dylib'
|
linkName = 'libssl.dylib'
|
||||||
sharedLibraryFile = file("$openSSLBrewHome/lib/$dllName")
|
sharedLibraryFile = new File("$openSSLBrewHome/lib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLBrewHome/lib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLBrewHome/lib/$linkName")
|
||||||
} else if (targetPlatform.operatingSystem.linux) {
|
} else if (targetPlatform.operatingSystem.linux) {
|
||||||
headers.srcDir "$openSSLLinuxInc/include"
|
headers.srcDir "$openSSLLinuxInc/include"
|
||||||
dllName = 'libssl.so'
|
dllName = 'libssl.so'
|
||||||
linkName = 'libssl.a'
|
linkName = 'libssl.a'
|
||||||
sharedLibraryFile = file("$openSSLLinuxLib/$dllName")
|
sharedLibraryFile = new File("$openSSLLinuxLib/$dllName")
|
||||||
sharedLibraryLinkFile = file("$openSSLLinuxLib/$linkName")
|
sharedLibraryLinkFile = new File("$openSSLLinuxLib/$linkName")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new GradleException("Unknown buildType" + buildType)
|
throw new GradleException("Unknown buildType" + buildType)
|
||||||
@@ -462,7 +463,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
components {
|
components {
|
||||||
withType(NativeComponentSpec) {
|
withType(NativeComponentSpec) {
|
||||||
targetPlatform "linux32"
|
//targetPlatform "linux32"
|
||||||
targetPlatform "linux64"
|
targetPlatform "linux64"
|
||||||
targetPlatform "macos"
|
targetPlatform "macos"
|
||||||
|
|
||||||
@@ -796,24 +797,21 @@ subprojects {
|
|||||||
|
|
||||||
args test
|
args test
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(CppCompile) {
|
tasks.withType(CppCompile) {
|
||||||
maxParallelForks = 2
|
maxParallelForks = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
task PocoDocIni {
|
task PocoDocIni() {
|
||||||
def file = new File("$rootDir/PocoDoc/PocoDoc.ini")
|
def file = new File("$rootDir/PocoDoc/PocoDoc.ini")
|
||||||
file.createNewFile()
|
file.createNewFile()
|
||||||
file.text = """
|
file.text = """
|
||||||
|
Includes=-I$rootDir/CppParser/include,-I$rootDir/CppUnit/include,-I$rootDir/Encodings/include,-I$rootDir/Crypto/include,-I$rootDir/Data/include,-I$rootDir/Data/include,-I$rootDir/Data/MySQL/include,-I$rootDir/Data/ODBC/include,-I$rootDir/Data/PostgreSQL/include,-I$rootDir/Data/SQLite/include, -I$rootDir/Data/SQLite/src,-I$rootDir/Foundation/include,-I$rootDir/JSON/include,-I$rootDir/MongoDB/include,-I$rootDir/Net/include,-I$rootDir/NetSSL_OpenSSL/include,-I$rootDir/NetSSL_Win/include,-I$rootDir/Redis/include,-I$rootDir/Util/include,-I$rootDir/XML/include,-I$rootDir/Zip/include,-I$rootDir/SevenZip/include,-I$rootDir/PDF/include
|
||||||
PocoBuild=$rootDir
|
PocoBuild=$rootDir
|
||||||
PocoBase=$rootDir
|
PocoBase=$rootDir
|
||||||
PocoDoc.output=releases/poco-${version}-all-doc
|
PocoDoc.output=releases/poco-${version}-all-doc
|
||||||
PocoDoc.version=${version}-all
|
PocoDoc.version=${version}-all
|
||||||
Includes=-I${postgres32Home}/include,-I${mysql32Home}/include,-ICppParser/include,-ICppUnit/include,-ICrypto/include,-IData/include,-IData/include,-IData/MySQL/include,-IData/ODBC/include,-IData/PostgreSQL/include,-IData/SQLite/include, -IData/SQLite/src,-IFoundation/include,-IJSON/include,-IMongoDB/include,-INet/include,-INetSSL_OpenSSL/include,-INetSSL_Win/include,-IRedis/include,-IUtil/include,-IXML/include,-IZip/include,-ISevenZip/include,-IPDF/include
|
|
||||||
"""
|
"""
|
||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
def String javaVCH = VCHome.replace('\\','/')
|
def String javaVCH = VCHome.replace('\\','/')
|
||||||
@@ -830,7 +828,7 @@ CLP=${javaCLP}
|
|||||||
if (os.linux) {
|
if (os.linux) {
|
||||||
file.text += """
|
file.text += """
|
||||||
CXX=g++
|
CXX=g++
|
||||||
CXXFLAGS=
|
CXXFLAGS=-std=c++11
|
||||||
"""
|
"""
|
||||||
} else
|
} else
|
||||||
if (os.macos) {
|
if (os.macos) {
|
||||||
@@ -850,13 +848,13 @@ task pocoDoc(type: Exec) {
|
|||||||
if (os.linux) {
|
if (os.linux) {
|
||||||
environment "LD_LIBRARY_PATH", "$rootDir/lib64:$LD_LIBRARY_PATH"
|
environment "LD_LIBRARY_PATH", "$rootDir/lib64:$LD_LIBRARY_PATH"
|
||||||
executable "PocoDoc/bin64/PocoDoc"
|
executable "PocoDoc/bin64/PocoDoc"
|
||||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
|
args "--config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
|
||||||
args "-config=$rootDir/PocoDoc/PocoDoc.ini"
|
args "--config=$rootDir/PocoDoc/PocoDoc.ini"
|
||||||
}
|
}
|
||||||
if (os.macOsX) {
|
if (os.macOsX) {
|
||||||
//FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH"
|
//FIXME environment "LD_LIBRARY_PATH", "$rootDir/bin:$LD_LIBRARY_PATH"
|
||||||
args "-config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
|
args "--config=$rootDir/PocoDoc/cfg/mkdoc-gradle.xml"
|
||||||
args "-config=$rootDir/PocoDoc/PocoDoc.ini"
|
args "--config=$rootDir/PocoDoc/PocoDoc.ini"
|
||||||
}
|
}
|
||||||
// inputs.files(tasks.getByPath(':production').outputs.files)
|
// inputs.files(tasks.getByPath(':production').outputs.files)
|
||||||
inputs.files(executable)
|
inputs.files(executable)
|
||||||
|
@@ -43,19 +43,21 @@ OpenCppCoverageHome=C:/Program Files/OpenCppCoverage
|
|||||||
#ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
#ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
||||||
ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
|
||||||
|
|
||||||
openSSLWindowsHome = "openssl/build"
|
openSSLWindowsHome = openssl/build
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Linux Customization
|
# Linux Customization
|
||||||
###############################################################################
|
###############################################################################
|
||||||
openSSLLinuxLib = "/usr/local/lib"
|
openSSLLinuxLib = /usr/local/lib
|
||||||
openSSLLinuxInc = "/usr/local/include/openssl"
|
openSSLLinuxInc = /usr/local/include/openssl
|
||||||
|
|
||||||
|
mysql32LinuxLib =
|
||||||
|
mysql32LinuxInc = /usr/local
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Mac OSX Customization
|
# Mac OSX Customization
|
||||||
###############################################################################
|
###############################################################################
|
||||||
openSSLBrewHome = "/usr/local/opt/openssl"
|
openSSLBrewHome = /usr/local/opt/openssl
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@@ -8,8 +8,8 @@ include ':XML'
|
|||||||
include ':JSON'
|
include ':JSON'
|
||||||
include ':Util'
|
include ':Util'
|
||||||
include ':Net'
|
include ':Net'
|
||||||
//include ':Crypto'
|
include ':Crypto'
|
||||||
//include ':NetSSL_OpenSSL'
|
include ':NetSSL_OpenSSL'
|
||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
include ':NetSSL_Win'
|
include ':NetSSL_Win'
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@ include ':Data'
|
|||||||
// SQL not ready yet
|
// SQL not ready yet
|
||||||
include ':Data:ODBC'
|
include ':Data:ODBC'
|
||||||
//include ':Data:SQLite'
|
//include ':Data:SQLite'
|
||||||
//include ':Data:MySQL'
|
include ':Data:MySQL'
|
||||||
include ':Zip'
|
include ':Zip'
|
||||||
include ':PageCompiler'
|
include ':PageCompiler'
|
||||||
include ':PageCompiler:File2Page'
|
include ':PageCompiler:File2Page'
|
||||||
@@ -34,16 +34,15 @@ include ':XML:testsuite'
|
|||||||
include ':JSON:testsuite'
|
include ':JSON:testsuite'
|
||||||
include ':Util:testsuite'
|
include ':Util:testsuite'
|
||||||
include ':Net:testsuite'
|
include ':Net:testsuite'
|
||||||
//include ':Crypto:testsuite'
|
include ':Crypto:testsuite'
|
||||||
//include ':NetSSL_OpenSSL:testsuite'
|
include ':NetSSL_OpenSSL:testsuite'
|
||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
include ':NetSSL_Win:testsuite'
|
include ':NetSSL_Win:testsuite'
|
||||||
}
|
}
|
||||||
include ':Data:testsuite'
|
include ':Data:testsuite'
|
||||||
include ':Data:ODBC:testsuite'
|
include ':Data:ODBC:testsuite'
|
||||||
include ':Data:SQLite:testsuite'
|
|
||||||
//include ':Data:MySQL:testsuite'
|
|
||||||
//include ':Data:SQLite:testsuite'
|
//include ':Data:SQLite:testsuite'
|
||||||
|
include ':Data:MySQL:testsuite'
|
||||||
include ':MongoDB:testsuite'
|
include ':MongoDB:testsuite'
|
||||||
include ':Redis:testsuite'
|
include ':Redis:testsuite'
|
||||||
include ':CppParser:testsuite'
|
include ':CppParser:testsuite'
|
||||||
@@ -51,8 +50,8 @@ include ':Zip:testsuite'
|
|||||||
|
|
||||||
include ':Encodings:samples'
|
include ':Encodings:samples'
|
||||||
include ':Foundation:samples'
|
include ':Foundation:samples'
|
||||||
include ':Data:samples'
|
//include ':Data:samples'
|
||||||
//include ':NetSSL_OpenSSL:samples'
|
include ':NetSSL_OpenSSL:samples'
|
||||||
if (os.windows) {
|
if (os.windows) {
|
||||||
include ':NetSSL_Win:samples'
|
include ':NetSSL_Win:samples'
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user