From cb3c31b4c6e4cb0a220549ea12f324734252bb9a Mon Sep 17 00:00:00 2001
From: Francis ANDRE <francis.andre.kampbell@orange.fr>
Date: Thu, 3 May 2018 18:04:59 +0200
Subject: [PATCH] Update Gradle build

---
 Data/MySQL/build.gradle           | 2 +-
 Data/MySQL/testsuite/build.gradle | 2 +-
 Data/samples/build.gradle         | 6 ++++++
 Foundation/build.gradle           | 1 -
 settings.gradle.win               | 6 +++---
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Data/MySQL/build.gradle b/Data/MySQL/build.gradle
index aec8b1154..f832b98c5 100644
--- a/Data/MySQL/build.gradle
+++ b/Data/MySQL/build.gradle
@@ -73,7 +73,7 @@ model {
 					exportedHeaders {
 						srcDir 'include'
 					}
-//					lib library: 'mysql'
+					lib library: 'mysql'
 					lib project: ':Data', library: 'Data'
 					lib project: ':Foundation', library: 'Foundation'
 				}
diff --git a/Data/MySQL/testsuite/build.gradle b/Data/MySQL/testsuite/build.gradle
index 0db52c527..fde70a829 100644
--- a/Data/MySQL/testsuite/build.gradle
+++ b/Data/MySQL/testsuite/build.gradle
@@ -28,7 +28,7 @@ model {
 						srcDir 'src'
 					}
 					lib project: ':CppUnit', library: 'CppUnit', linkage: 'shared'
-//					lib project: ':Data:MySQL', library: 'mysql', linkage: 'shared'
+					lib project: ':Data:MySQL', library: 'mysql', linkage: 'shared'
 					lib project: ':Data:MySQL', library: 'DataMySQL', linkage: 'shared'
 					lib project: ':Data', library: 'Data', linkage: 'shared'
 					lib project: ':Util', library: 'Util'
diff --git a/Data/samples/build.gradle b/Data/samples/build.gradle
index bcfde3a28..55b9c387e 100644
--- a/Data/samples/build.gradle
+++ b/Data/samples/build.gradle
@@ -4,6 +4,7 @@ model {
 			sources {
 				cpp.source { srcDir 'Binding/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
 		}
@@ -11,6 +12,7 @@ model {
 			sources {
 				cpp.source { srcDir 'RecordSet/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
 		}
@@ -18,6 +20,7 @@ model {
 			sources {
 				cpp.source { srcDir 'RowFormatter/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
 		}
@@ -25,6 +28,7 @@ model {
 			sources {
 				cpp.source { srcDir 'Tuple/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
 		}
@@ -32,6 +36,7 @@ model {
 			sources {
 				cpp.source { srcDir 'TypeHandler/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
 		}
@@ -39,6 +44,7 @@ model {
 			sources {
 				cpp.source { srcDir 'WebNotifier/src' include '**/*.cpp' }
 				cpp.lib project: ':Data', library: 'Data'				
+				cpp.lib project: ':Data:SQLite', library: 'DataSQLite'				
 				cpp.lib project: ':Net', library: 'Net'				
 				cpp.lib project: ':Foundation', library: 'Foundation'				
 			}
diff --git a/Foundation/build.gradle b/Foundation/build.gradle
index abacf4549..91c80201b 100644
--- a/Foundation/build.gradle
+++ b/Foundation/build.gradle
@@ -103,7 +103,6 @@ model {
 		}
 		withType(SharedLibraryBinarySpec) {
 			if (toolChain in VisualCpp) {
-//					addCompilerDefine "Foundation_EXPORTS" ""
 				cCompiler.define "Foundation_EXPORTS"
 				cppCompiler.define "Foundation_EXPORTS"
 			}
diff --git a/settings.gradle.win b/settings.gradle.win
index e2a6f5d6f..d00f96cf0 100644
--- a/settings.gradle.win
+++ b/settings.gradle.win
@@ -18,7 +18,7 @@ include ':Data'
 if (os.windows) {
 	include ':Data:ODBC'
 	include ':Data:SQLite'
-//	include ':Data:MySQL'
+	include ':Data:MySQL'
 }
 include ':Zip'
 include ':PageCompiler'
@@ -45,9 +45,9 @@ include ':Data:testsuite'
 if (os.windows) {
 	include ':Data:ODBC:testsuite'
 	include ':Data:SQLite:testsuite'
-//	include ':Data:MySQL:testsuite'
+	include ':Data:MySQL:testsuite'
 }
-//include ':MongoDB:testsuite'
+include ':MongoDB:testsuite'
 include ':Redis:testsuite'
 include ':CppParser:testsuite'
 include ':Zip:testsuite'