convert mysqlc to gbuild and add to tail_build

Change-Id: Ia64bc884ed04a5d5652fb743f543a39e6b6bbcf2
Reviewed-on: https://gerrit.libreoffice.org/1901Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

Module_tail_build.mk

@@ -123,6 +123,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
 	$(call gb_Helper_optional,MDDS,mdds) \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,MYSQLC,mysqlc) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
 	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \

Repository.mk

@@ -572,6 +572,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     migrationoo3 \
     msforms \
     mtfrenderer \
+    mysqlc \
     nullcanvas \
     OGLTrans \
     passwordcontainer \

RepositoryExternal.mk

@@ -222,7 +222,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 )
 
 $(call gb_LinkTarget_add_defs,$(1),\
-	-DSYSTEM_MYSQL_CPPCONN` \
+	-DSYSTEM_MYSQL_CPPCONN \
 )
 endef
 
@@ -237,6 +237,10 @@ define gb_LinkTarget__use_mysqlcppconn
 $(call gb_LinkTarget_use_libraries,$(1),\
 	mysqlcppconn \
 )
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DCPPCONN_LIB_BUILD \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \
 	-I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \

RepositoryModule_ooo.mk

@@ -131,6 +131,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 	$(call gb_Helper_optional,MDDS,mdds) \
 	Mesa \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,MYSQLC,mysqlc) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
 	$(call gb_Helper_optional,MYTHES,mythes) \
 	$(call gb_Helper_optional,NEON,neon) \

config_host.mk.in

@@ -404,6 +404,9 @@ export MSVC80_DLL_DIR=@MSVC80_DLL_DIR@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
+export MYSQLC_MAJOR=@MYSQLC_MAJOR@
+export MYSQLC_MINOR=@MYSQLC_MINOR@
+export MYSQLC_MICRO=@MYSQLC_MICRO@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
 export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@

configure.ac

@@ -7759,12 +7759,18 @@ AC_MSG_CHECKING([whether to build the MySQL Connector extension])
 if test "x$enable_ext_mysql_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
     AC_MSG_RESULT([yes])
     ENABLE_MYSQLC=YES
+    MYSQLC_MAJOR=1
+    MYSQLC_MINOR=0
+    MYSQLC_MICRO=1
     BUILD_TYPE="$BUILD_TYPE MYSQLC"
 else
     AC_MSG_RESULT([no])
     ENABLE_MYSQLC=NO
 fi
 AC_SUBST(ENABLE_MYSQLC)
+AC_SUBST(MYSQLC_MAJOR)
+AC_SUBST(MYSQLC_MINOR)
+AC_SUBST(MYSQLC_MICRO)
 
 if test "$ENABLE_MYSQLC" = "YES"; then
 

mysqlc/Configuration_mysql.mk

+# -*- 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_Configuration_Configuration,mysql,nodeliver))
+
+$(eval $(call gb_Configuration_add_localized_datas,mysql,mysqlc/source/registry/data,\
+	org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+

mysqlc/Extension_mysql-connector-ooo.mk

+# -*- 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_Extension_Extension,mysql-connector-ooo,mysqlc/source))
+
+$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlc))
+
+$(eval $(call gb_Extension_add_file,mysql-connector-ooo,registry/data/org/openoffice/Office/DataAccess/Drivers.xcu,$(call gb_XcuFile_for_extension,mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu)))
+
+$(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\
+    $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
+))
+
+ifeq ($(SYSTEM_MYSQL_CPPCON),NO)
+$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
+	$(call gb_Library_get_target,mysqlcppcon) \
+))
+endif
+
+# HACK: comes from Library_mysql.mk
+ifeq ($(SYSTEM_MYSQL),NO)
+$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
+	$(LIBMYSQL_PATH)/lib/$(MYSQL_LIBFILE) \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:

mysqlc/Library_mysqlc.mk

+# -*- 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,mysqlc))
+
+$(eval $(call gb_Library_set_warnings_not_errors,mysqlc))
+
+$(eval $(call gb_Library_use_externals,mysqlc,\
+	boost_headers \
+	mysql \
+	mysqlcppconn \
+))
+
+ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+$(eval $(call gb_Library_add_libs,mysqlc,\
+	$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\
+	-rdynamic -lz -lcrypt -lnsl -lm)) \
+))
+endif
+
+$(eval $(call gb_Library_use_sdk_api,mysqlc))
+
+$(eval $(call gb_Library_use_libraries,mysqlc,\
+	cppu \
+	sal \
+	salhelper \
+	cppuhelper \
+))
+
+MYSQL_LIBFILE :=$(if $(filter WNT,$(OS)),libmysql.dll,\
+	$(if $(filter MACOSX,$(OS)),libmysql.16.dylib,libmysql.so.16))
+
+$(eval $(call gb_Library_add_defs,mysqlc,\
+	-DCPPDBC_EXPORTS \
+	-DCPPCON_LIB_BUILD \
+	-DMYSQLC_VERSION_MAJOR=$(MYSQLC_MAJOR) \
+	-DMYSQLC_VERSION_MINOR=$(MYSQLC_MINOR) \
+	-DMYSQLC_VERSION_MICRO=$(MYSQLC_MICRO) \
+	$(if $(filter NO,$(SYSTEM_MYSQL)),-DMYSQL_LIB=\"$(MYSQL_LIBFILE)\") \
+	$(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\
+	-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mysqlc,\
+	mysqlc/source/mysqlc_driver \
+	mysqlc/source/mysqlc_services \
+	mysqlc/source/mysqlc_connection \
+	mysqlc/source/mysqlc_resultset \
+	mysqlc/source/mysqlc_resultsetmetadata \
+	mysqlc/source/mysqlc_statement \
+	mysqlc/source/mysqlc_preparedstatement \
+	mysqlc/source/mysqlc_databasemetadata \
+	mysqlc/source/mysqlc_types \
+	mysqlc/source/mysqlc_general \
+	mysqlc/source/mysqlc_propertyids \
+))
+
+# vim: set noet sw=4 ts=4:

mysqlc/Makefile

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

mysqlc/Module_mysqlc.mk

+# -*- 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_Module_Module,mysqlc))
+
+ifeq ($(ENABLE_MYSQLC),YES)
+
+$(eval $(call gb_Module_add_targets,mysqlc,\
+	Configuration_mysql \
+	Library_mysqlc \
+	Extension_mysql-connector-ooo \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

mysqlc/prj/build.lst

 mc	mysqlc	:	solenv MYSQLCPPCONN:mysqlcppconn offapi cppu soltools cppuhelper readlicense_oo NULL
-ch	mysqlc              usr1    -	all mc_mkout NULL
-mc	mysqlc\source       nmake   -   all mc_source NULL
+mc	mysqlc\prj       nmake   -   all mc_mysqlc NULL

mysqlc/prj/d.lst

-# Extensions
-
-..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
-

mysqlc/source/description.xml

@@ -20,7 +20,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
     <identifier value="UPDATED_IDENTIFIER"/>
-    <version value="#VERSION#" />
+    <version value="1.0.1" />
     <platform value="UPDATED_SUPPORTED_PLATFORM" />
     <display-name>
         <name lang="en-US">MySQL Connector</name>

mysqlc/source/exports.dxp

-component_writeInfo
-component_getFactory

mysqlc/source/makefile.mk

-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=mysqlc
-
-.INCLUDE : $(PRJ)$/version.mk
-
-TARGET=mysqlc
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN = TRUE
-LIBTARGET=NO
-EXTENSIONNAME:=mysql-connector-ooo
-
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-#-------------------------------------------------------------------
-
-#---- extension version
-EXTENSION_VERSION_BASE=$(MYSQLC_VERSION_MAJOR).$(MYSQLC_VERSION_MINOR).$(MYSQLC_VERSION_MICRO)
-    EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
-
-#---- extension title package name
-EXTENSION_ZIPNAME:=$(EXTENSIONNAME)
-
-#-------------------------------------------------------------------
-
-# The headers delivered from C/C++ have a habit of putting a ";" after the closing bracked of a namespace, which
-# yields a warning with Solaris' compiler. Until this is fixed in C/C++, silence this warning
-.IF "$(OS)" == "SOLARIS"
-    CFLAGSWARNCXX+=,wemptydecl
-    CFLAGSWARNCXX:=$(CFLAGSWARNCXX:s/ ,/,/)
-.ENDIF
-
-#-------------------------------------------------------------------
-.IF "$(ENABLE_MYSQLC)" != "YES"
-@all:
-    @echo "Mysql native driver extension build disabled."
-.ENDIF
-
-# use the static version
-.IF "$(OS)"=="WNT"
-  MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
-  MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
-.ELSE
-  .IF "$(SYSTEM_MYSQL)" != "YES"
-    MYSQL_LIBDIR=$(LIBMYSQL_PATH)$/lib
-    MYSQL_INCDIR=$(LIBMYSQL_PATH)$/include
-  .ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_MYSQL)" == "YES"
-CFLAGS+=-DSYSTEM_MYSQL
-.ENDIF
-
-.IF "$(SYSTEM_MYSQL_CPPCONN)" == "YES"
-CFLAGS+=-DSYSTEM_MYSQL_CPPCONN
-.ENDIF
-
-CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
-.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
-CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
-.ENDIF
-
-# --------------- MySQL settings ------------------
-.IF "$(OS)"=="WNT"
-  MYSQL_INC=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn -I$(MYSQL_INCDIR)
-  MYSQL_LIB=$(MYSQL_LIBDIR)$/libmysql.lib
-  MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysql.dll
-  MYSQL_CPPCONNFILE=$(SOLARBINDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
-.ELSE
-  .IF "$(SYSTEM_MYSQL)" != "YES"
-    MYSQL_INC+=-I$(MYSQL_INCDIR)
-    .IF "$(OS)"=="MACOSX"
-      MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql.16$(DLLPOST)
-    .ELSE
-      MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/$(DLLPRE)mysql$(DLLPOST).16
-    .ENDIF
-  .ENDIF
-
-  .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
-    .IF "$(OS)"=="MACOSX" || "$(OS)" == "SOLARIS"
-      MYSQL_LIB+=-lz -lm
-    .ELSE
-      MYSQL_LIB+=-rdynamic -lz -lcrypt -lnsl -lm
-    .ENDIF
-    MYSQL_CPPCONNFILE=$(SOLARLIBDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
-  .ELSE
-    MYSQL_CPPCONN_LIB+=-lmysqlcppconn
-  .ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
-  MYSQL_INC+=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn
-.ENDIF
-
-CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \
-	-I$(WORKDIR)/UnpackedTarball/boost \
-    -DMYSQLC_VERSION_MAJOR=$(MYSQLC_VERSION_MAJOR) \
-    -DMYSQLC_VERSION_MINOR=$(MYSQLC_VERSION_MINOR) \
-    -DMYSQLC_VERSION_MICRO=$(MYSQLC_VERSION_MICRO) \
-    $(MYSQL_DEFINES)
-
-# provide the name of the MySQL client lib to the C++ code
-.IF "$(SYSTEM_MYSQL)" != "YES"
-CDEFS += -DMYSQL_LIB=\"$(MYSQL_LIBFILE:f)\"
-.ENDIF
-
-#--------------------------------------------------
-
-SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
-LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
-LIB1OBJFILES= \
-        $(SLO)$/mysqlc_driver.obj \
-        $(SLO)$/mysqlc_services.obj  \
-        $(SLO)$/mysqlc_connection.obj \
-        $(SLO)$/mysqlc_resultset.obj \
-        $(SLO)$/mysqlc_resultsetmetadata.obj \
-        $(SLO)$/mysqlc_statement.obj \
-        $(SLO)$/mysqlc_preparedstatement.obj \
-        $(SLO)$/mysqlc_databasemetadata.obj \
-        $(SLO)$/mysqlc_types.obj \
-        $(SLO)$/mysqlc_general.obj \
-        $(SLO)$/mysqlc_propertyids.obj
-
-SHL1STDLIBS= \
-        $(MYSQL_LIB)                \
-        $(MYSQL_CPPCONN_LIB)        \
-        $(CPPULIB)                  \
-        $(SALLIB)                   \
-        $(SALHELPERLIB)             \
-        $(CPPUHELPERLIB)
-
-SHL1LIBS=	$(LIB1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=OXT
-DEF1NAME=	$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# create Extension -----------------------------
-
-# DESCRIPTION_SRC is the source file which is copied into the extension
-# It is defaulted to "description.xml", but we want to pre-process it, so we use an intermediate
-# file
-DESCRIPTION_SRC = $(MISC)$/description.xml
-
-COMPONENT_XCU=\
-        registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu
-
-COMPONENT_MERGED_XCU= \
-        $(foreach,i,$(COMPONENT_XCU) $(EXTENSIONDIR)$/$i)
-
-COMPONENT_LIBRARY = \
-            $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
-
-COMPONENT_MYSQL_LIBFILE = \
-            $(EXTENSIONDIR)$/$(MYSQL_LIBFILE:f) 
-
-COMPONENT_MYSQL_CPPCONN_FILE=\
-            $(EXTENSIONDIR)$/$(MYSQL_CPPCONNFILE:f)
-
-COMPONENT_LIBRARIES=\
-            $(COMPONENT_LIBRARY)
-
-COMPONENT_IMAGES= \
-    $(EXTENSIONDIR)$/images$/extension_32.png
-
-# ........ component description ........
-# one file for each WITH_LANG token
-COMPONENT_DESCRIPTIONS=$/$(foreach,lang,$(alllangiso) description-$(lang).txt)
-COMPONENT_DESCRIPTIONS_PACKDEP= \
-    $(foreach,i,$(COMPONENT_DESCRIPTIONS) $(EXTENSIONDIR)$/$i)
-
-# ........ dependencies for packaging the extension ........
-EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES) $(COMPONENT_DESCRIPTIONS_PACKDEP) $(COMPONENT_MERGED_XCU)
-
-.IF "$(SYSTEM_MYSQL)" != "YES"
-EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_LIBFILE)
-.ENDIF
-
-.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
-EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-# xcu files: copy
-# the following is a hack for now - need to find out the generic mechanism later
-
-$(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu : .$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu
-    @@-$(MKDIRHIER) $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess
-    @$(COPY) $< $(EXTENSIONDIR)$/registry$/data$/org$/openoffice$/Office$/DataAccess$/Drivers.xcu > $(NULLDEV)
-
-$(COMPONENT_DESCRIPTIONS_PACKDEP) : $(DESCRIPTION)
-
-$(DESCRIPTION_SRC): description.xml
-    +-$(RM) $@
-.IF "$(WITH_LANG)" != ""
-    $(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(mktmp $(foreach,lang,$(subst,en-US, $(WITH_LANG_LIST)) $(SRCDIR)/translations/source/$(lang)/$(PRJNAME)$/$(PATH_IN_MODULE).po)) -l all
-    $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $@ > $@.new
-    mv $@.new $@
-    @$(COPY) $(@:d)/description-*.txt $(EXTENSIONDIR)
-.ELSE
-    $(SED) "s/#VERSION#/$(EXTENSION_VERSION)/" < $< > $@
-.ENDIF
-    @$(COPY) description-en-US.txt $(EXTENSIONDIR)
-
-.IF "$(SYSTEM_MYSQL)" != "YES" 
-# --- the MySQL client lib needs to be copied
-$(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE)
-    @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
-    .IF "$(OS)" == "MACOSX"
-        $(XCRUN) install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@
-    .ENDIF
-.ENDIF
-
-.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
-# --- the MySQL cppconn lib needs to be copied
-$(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE)
-    @@-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@ > $(NULLDEV)
-    .IF "$(OS)" == "MACOSX"
-        $(XCRUN) install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@
-    .ENDIF
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-$(EXTENSION_TARGET): adjust_libmysql_path
-
-adjust_libmysql_path: $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
-    $(XCRUN) install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
-.ENDIF

mysqlc/source/mysqlc_preparedstatement.cxx

@@ -35,6 +35,10 @@
 
 #include <stdio.h>
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 using namespace connectivity::mysqlc;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;

mysqlc/version.mk

-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-MYSQLC_VERSION_MAJOR=1
-MYSQLC_VERSION_MINOR=0
-MYSQLC_VERSION_MICRO=1

postprocess/prj/build.lst

-po      postprocess     ::      HELP:helpcontent2 ODK:odk MYSQLC:mysqlc DESKTOP:setup_native sysui tail_build NULL
+po      postprocess     ::      HELP:helpcontent2 ODK:odk DESKTOP:setup_native sysui tail_build NULL
 po	postprocess\prj		nmake	-	all	po_prj NULL