Update Gradle

This commit is contained in:
Francis ANDRE 2018-05-07 21:09:22 +02:00
parent 3b3d2652fc
commit bbddf9744c
4 changed files with 44 additions and 23 deletions

View File

@ -5,7 +5,32 @@ model {
binaries.withType(StaticLibraryBinary) {
def libName = "foobar"
if (buildType == buildTypes.debug) {
libName = 'libmysqld.lib'
libName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir new File("$mysql32Home/include")
staticLibraryFile = new File("$mysql32Home/lib/$libName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir new File("$mysql64Home/include")
staticLibraryFile = new File("$mysql64Home/lib/$libName")
}
} else
if (buildType == buildTypes.release) {
libName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir new File("$mysql32Home/include")
staticLibraryFile = new File("$mysql32Home/lib/$libName")
} else
if (targetPlatform.name == 'win64') {
headers.srcDir new File("$mysql64Home/include")
staticLibraryFile = new File("$mysql64Home/lib/$libName")
}
}
}
binaries.withType(SemiStaticLibraryBinary) {
def libName = "foobar"
if (buildType == buildTypes.debug) {
libName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir new File("$mysql32Home/include")
staticLibraryFile = new File("$mysql32Home/lib/$libName")
@ -31,8 +56,8 @@ model {
def dllName
def linkName
if (buildType == buildTypes.debug) {
dllName = 'libmysqld.dll'
linkName = 'libmysqld.lib'
dllName = 'libmysql.dll'
linkName = 'libmysql.lib'
if (targetPlatform.name == 'win32') {
headers.srcDir new File("$mysql32Home/include")
sharedLibraryFile = new File("$mysql32Home/lib/$dllName")

View File

@ -193,7 +193,7 @@ model {
}
}
components {
SQLPostgreSQL(NativeLibrarySpec) {
DataPostgreSQL(NativeLibrarySpec) {
sources {
rc {
source {
@ -210,7 +210,7 @@ model {
srcDir 'include'
}
lib library: 'postgres'
lib project: ':SQL', library: 'SQL'
lib project: ':Data', library: 'Data'
lib project: ':Foundation', library: 'Foundation'
}
}

View File

@ -28,11 +28,11 @@ model {
srcDir 'src'
}
lib project: ':CppUnit', library: 'CppUnit'
lib project: ':SQL:PostgreSQL', library: 'SQLPostgreSQL'
lib project: ':SQL:PostgreSQL', library: 'postgres'
lib project: ':SQL:PostgreSQL', library: 'intl'
lib project: ':SQL:PostgreSQL', library: 'iconv'
lib project: ':SQL', library: 'SQL'
lib project: ':Data:PostgreSQL', library: 'DataPostgreSQL'
lib project: ':Data:PostgreSQL', library: 'postgres'
lib project: ':Data:PostgreSQL', library: 'intl'
lib project: ':Data:PostgreSQL', library: 'iconv'
lib project: ':Data', library: 'Data'
lib project: ':Foundation', library: 'Foundation'
}
}

View File

@ -15,11 +15,10 @@ if (os.windows) {
include ':NetSSL_Win'
}
include ':Data'
if (os.windows) {
include ':Data:ODBC'
include ':Data:SQLite'
include ':Data:MySQL'
}
include ':Data:ODBC'
include ':Data:SQLite'
include ':Data:MySQL'
include ':Data:PostgreSQL'
include ':Zip'
include ':PageCompiler'
include ':PageCompiler:File2Page'
@ -42,11 +41,10 @@ if (os.windows) {
include ':NetSSL_Win:testsuite'
}
include ':Data:testsuite'
if (os.windows) {
include ':Data:ODBC:testsuite'
include ':Data:SQLite:testsuite'
include ':Data:MySQL:testsuite'
}
include ':Data:ODBC:testsuite'
include ':Data:SQLite:testsuite'
include ':Data:MySQL:testsuite'
include ':Data:PostgreSQL:testsuite'
include ':MongoDB:testsuite'
include ':Redis:testsuite'
include ':CppParser:testsuite'
@ -54,9 +52,7 @@ include ':Zip:testsuite'
include ':Encodings:samples'
include ':Foundation:samples'
if (os.windows) {
include ':Data:samples'
}
include ':Data:samples'
include ':NetSSL_OpenSSL:samples'
if (os.windows) {
include ':NetSSL_Win:samples'