consistent naming of externals: mysqlcppconn -> mysql-connector-cpp

Change-Id: Ibfb3aa69895eef6023c38e2ff3b7ae98a05f5820
Reviewed-on: https://gerrit.libreoffice.org/42300
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

15 files changed, 117 insertions, 117 deletions

diff --git a/external/Module_external.mk b/external/Module_external.mk
index de79fb2f7d56..590e216b3c2b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -73,7 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
-	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
+	$(call gb_Helper_optional,MYSQL_CONNECTOR_CPP,mysql-connector-cpp) \
 	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \
 	$(call gb_Helper_optional,NSS,nss) \
diff --git a/external/mysql-connector-cpp/Library_mysqlcppconn.mk b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
new file mode 100644
index 000000000000..152aee8c0764
--- /dev/null
+++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
@@ -0,0 +1,87 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,mysqlcppconn))
+
+$(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysql-connector-cpp))
+
+$(eval $(call gb_Library_use_externals,mysqlcppconn, \
+	boost_headers \
+	mariadb-connector-c \
+))
+
+ifneq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_libs,mysqlcppconn,\
+	$(if $(filter-out MACOSX,$(OS)),-ldl) \
+))
+
+endif
+
+ifeq ($(OS),MACOSX)
+ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),)
+$(eval $(call gb_Library_use_externals,mysqlcppconn,\
+	    iconv \
+))
+endif
+endif
+
+$(eval $(call gb_Library_set_external_code,mysqlcppconn))
+
+$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
+
+$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
+
+$(eval $(call gb_Library_set_include,mysqlcppconn,\
+	$$(INCLUDE) \
+	-I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \
+	-I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \
+))
+
+$(eval $(call gb_Library_add_defs,mysqlcppconn,\
+	-Dmysqlcppconn_EXPORTS \
+	$(if $(filter WNT,$(OS)),\
+	-DCPPDBC_WIN32 \
+	-D_CRT_SECURE_NO_WARNINGS \
+	-D_SCL_SECURE_NO_WARNINGS ) \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,mysqlcppconn,\
+	-lpthread \
+))
+endif
+
+$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_art_resultset \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_art_rset_metadata \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_connection \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_debug \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_driver \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_metadata \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_parameter_metadata \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_prepared_statement \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_ps_resultset_metadata \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultbind \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_resultset_metadata \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_statement \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_uri \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_util \
+	UnpackedTarball/mysql-connector-cpp/driver/mysql_warning \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_client_api \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/library_loader \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_driver_wrapper \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_connection_wrapper \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_resultset_wrapper \
+	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/Makefile b/external/mysql-connector-cpp/Makefile
index e4968cf85fb6..e4968cf85fb6 100644
--- a/external/mysqlcppconn/Makefile
+++ b/external/mysql-connector-cpp/Makefile
diff --git a/external/mysqlcppconn/Module_mysqlcppconn.mk b/external/mysql-connector-cpp/Module_mysql-connector-cpp.mk
index 6a45dd8d8eea..59e6229166bd 100644
--- a/external/mysqlcppconn/Module_mysqlcppconn.mk
+++ b/external/mysql-connector-cpp/Module_mysql-connector-cpp.mk
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Module_Module,mysqlcppconn))
+$(eval $(call gb_Module_Module,mysql-connector-cpp))
 
-$(eval $(call gb_Module_add_targets,mysqlcppconn,\
-	UnpackedTarball_mysqlcppconn \
+$(eval $(call gb_Module_add_targets,mysql-connector-cpp,\
+	UnpackedTarball_mysql-connector-cpp \
 	Library_mysqlcppconn \
 ))
 
diff --git a/external/mysqlcppconn/README b/external/mysql-connector-cpp/README
index b49803dadfdb..b49803dadfdb 100644
--- a/external/mysqlcppconn/README
+++ b/external/mysql-connector-cpp/README
diff --git a/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk
new file mode 100644
index 000000000000..be0e482d5315
--- /dev/null
+++ b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,mysql-connector-cpp))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,mysql-connector-cpp,$(MYSQL_CONNECTOR_CPP_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,cppconn/config.h,external/mysql-connector-cpp/config.h))
+$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,version_info.h,external/mysql-connector-cpp/version_info.h))
+
+$(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,driver/nativeapi/binding_config.h,external/mysql-connector-cpp/binding_config.h))
+
+$(eval $(call gb_UnpackedTarball_add_patches,mysql-connector-cpp,\
+	external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch \
+	external/mysql-connector-cpp/patches/warnings.patch.0 \
+	external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch \
+	external/mysql-connector-cpp/patches/dynexcspec.patch.0 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/binding_config.h b/external/mysql-connector-cpp/binding_config.h
index 23811e8965b3..23811e8965b3 100644
--- a/external/mysqlcppconn/binding_config.h
+++ b/external/mysql-connector-cpp/binding_config.h
diff --git a/external/mysqlcppconn/config.h b/external/mysql-connector-cpp/config.h
index eaa929437182..eaa929437182 100644
--- a/external/mysqlcppconn/config.h
+++ b/external/mysql-connector-cpp/config.h
diff --git a/external/mysqlcppconn/patches/dynexcspec.patch.0 b/external/mysql-connector-cpp/patches/dynexcspec.patch.0
index ed7ac3685a4b..ed7ac3685a4b 100644
--- a/external/mysqlcppconn/patches/dynexcspec.patch.0
+++ b/external/mysql-connector-cpp/patches/dynexcspec.patch.0
diff --git a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch b/external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch
index 6a5894cb1e9c..6a5894cb1e9c 100644
--- a/external/mysqlcppconn/patches/enable-libmysql-proxy.patch
+++ b/external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch
diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch
index ec439d2dfd56..ec439d2dfd56 100644
--- a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch
+++ b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch
diff --git a/external/mysqlcppconn/patches/warnings.patch.0 b/external/mysql-connector-cpp/patches/warnings.patch.0
index 2cda42d86398..2cda42d86398 100644
--- a/external/mysqlcppconn/patches/warnings.patch.0
+++ b/external/mysql-connector-cpp/patches/warnings.patch.0
diff --git a/external/mysqlcppconn/version_info.h b/external/mysql-connector-cpp/version_info.h
index a0203da33864..a0203da33864 100644
--- a/external/mysqlcppconn/version_info.h
+++ b/external/mysql-connector-cpp/version_info.h
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
deleted file mode 100644
index 2b37b8de6bc7..000000000000
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, you can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,mysqlcppconn))
-
-$(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysqlcppconn))
-
-$(eval $(call gb_Library_use_externals,mysqlcppconn, \
-	boost_headers \
-	mariadb-connector-c \
-))
-
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
-	$(if $(filter-out MACOSX,$(OS)),-ldl) \
-))
-
-endif
-
-ifeq ($(OS),MACOSX)
-ifeq ($(SYSTEM_MARIADB_CONNECTOR_C),)
-$(eval $(call gb_Library_use_externals,mysqlcppconn,\
-	    iconv \
-))
-endif
-endif
-
-$(eval $(call gb_Library_set_external_code,mysqlcppconn))
-
-$(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
-
-$(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp))
-
-$(eval $(call gb_Library_set_include,mysqlcppconn,\
-	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \
-	-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \
-))
-
-$(eval $(call gb_Library_add_defs,mysqlcppconn,\
-	-Dmysqlcppconn_EXPORTS \
-	$(if $(filter WNT,$(OS)),\
-	-DCPPDBC_WIN32 \
-	-D_CRT_SECURE_NO_WARNINGS \
-	-D_SCL_SECURE_NO_WARNINGS ) \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,mysqlcppconn,\
-	-lpthread \
-))
-endif
-
-$(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
-	UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
-	UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \
-	UnpackedTarball/mysqlcppconn/driver/mysql_connection \
-	UnpackedTarball/mysqlcppconn/driver/mysql_debug \
-	UnpackedTarball/mysqlcppconn/driver/mysql_driver \
-	UnpackedTarball/mysqlcppconn/driver/mysql_metadata \
-	UnpackedTarball/mysqlcppconn/driver/mysql_parameter_metadata \
-	UnpackedTarball/mysqlcppconn/driver/mysql_prepared_statement \
-	UnpackedTarball/mysqlcppconn/driver/mysql_ps_resultset \
-	UnpackedTarball/mysqlcppconn/driver/mysql_ps_resultset_metadata \
-	UnpackedTarball/mysqlcppconn/driver/mysql_resultbind \
-	UnpackedTarball/mysqlcppconn/driver/mysql_resultset \
-	UnpackedTarball/mysqlcppconn/driver/mysql_resultset_metadata \
-	UnpackedTarball/mysqlcppconn/driver/mysql_statement \
-	UnpackedTarball/mysqlcppconn/driver/mysql_uri \
-	UnpackedTarball/mysqlcppconn/driver/mysql_util \
-	UnpackedTarball/mysqlcppconn/driver/mysql_warning \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_client_api \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/library_loader \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_driver_wrapper \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_connection_wrapper \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_resultset_wrapper \
-	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
deleted file mode 100644
index 82a368460747..000000000000
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mysqlcppconn))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,external/mysqlcppconn/config.h))
-$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,version_info.h,external/mysqlcppconn/version_info.h))
-
-$(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,external/mysqlcppconn/binding_config.h))
-
-$(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
-	external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
-	external/mysqlcppconn/patches/warnings.patch.0 \
-        external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
-	external/mysqlcppconn/patches/dynexcspec.patch.0 \
-))
-
-# vim: set noet sw=4 ts=4: