diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-08-16 16:35:17 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-28 20:29:12 +0200 |
| commit | 490c6cd0ed877a0bd22a7592b42d70edd83114ca (patch) | |
| tree | 340f64246980e3ee793309dac0453584676c3790 /postprocess | |
| parent | 4e8a7a6cbca2ba4119647dfeb59da68bedb3e157 (diff) | |
Moving mysqlc into connectivity as a library
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66
Reviewed-on: https://gerrit.libreoffice.org/59200
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/59713
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 | ||||
| -rw-r--r-- | postprocess/Rdb_services.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index ea60c57b7bd7..dc58f0657dce 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -280,9 +280,9 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) postprocess_FILES_main += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu -postprocess_DRIVERS += dbase flat mysql odbc +postprocess_DRIVERS += dbase flat mysqlc odbc ifeq (WNT,$(OS)) else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 9b0475d8094c..5450f835eae7 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -252,7 +252,7 @@ $(eval $(call gb_Rdb_add_components,services,\ connectivity/source/drivers/firebird/firebird_sdbc \ ) \ connectivity/source/drivers/flat/flat \ - connectivity/source/drivers/mysql/mysql \ + connectivity/source/drivers/mysqlc/mysqlc \ $(if $(filter MACOSX,$(OS)), \ connectivity/source/drivers/macab/macab1 \ ) \ |