Attachment #77011 for issue #118594

View | Details | Raw Unified | Return to issue 118594
Collapse All | Expand All




	SYSTEM_MYSQL=YES
	AC_PATH_PROG( MYSQLCONFIG, mysql_config)
	AC_MSG_CHECKING([MySQL version])
	if test -z "$MYSQLCONFIG" -o ! -x "$MYSQLCONFIG" ; then
		AC_MSG_ERROR([can not find/execute mysql_config]);
	fi
	MYSQL_VERSION=`$MYSQLCONFIG --version` 
	MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1`
	if test "$MYSQL_MAJOR" -ge "5"; then

        AC_LANG_POP([C++])

else
	AC_MSG_RESULT([no])
	SYSTEM_MYSQL_CPPCONN=
        if test -d mysqlcppconn; then
          AC_MSG_RESULT([OK])
        else
          AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
        fi
	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
	SYSTEM_MYSQL_CPPCONN=NO
fi
AC_LANG_POP([C++])
AC_SUBST(SYSTEM_MYSQL_CPPCONN)

Lines 1-3 Link Here

(-)a/main/mysqlc/prj/build.lst (-1 / +1 lines)
1	mc mysqlc : solenv MYSQLCPPCONN:mysqlcppconn offuh cppu soltools cppuhelper readlicense_oo NULL	1	mc mysqlc : solenv offuh cppu soltools cppuhelper readlicense_oo NULL
2	ch mysqlc usr1 - all mc_mkout NULL	2	ch mysqlc usr1 - all mc_mkout NULL
3	mc mysqlc\source nmake - all mc_source NULL	3	mc mysqlc\source nmake - all mc_source NULL




.ENDIF

CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
.IF "$(SYSTEM_MYSQL_CPPCONN)" == "YES"
CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
.ELSE
CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
.IF "$(USE_SYSTEM_STL)"!="YES"
CDEFS += -DADAPT_EXT_STL

.ENDIF

# --------------- MySQL settings ------------------
.IF "$(GUI)"!="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"

    EXTRALIBPATHS=-L$(MYSQL_LIBDIR)
  .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) \

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

    .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"
        install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@
    .ENDIF
.ENDIF

.IF "$(OS)" == "MACOSX"
$(EXTENSION_TARGET): adjust_libmysql_path






#include <preextstl.h>
#include <cppconn/exception.h>
#include <mysql_driver.h>
    #include <mysql_driver.h>
#endif
#include <postextstl.h>



MysqlCDriver::MysqlCDriver(const Reference< XMultiServiceFactory >& _rxFactory)
	: ODriver_BASE(m_aMutex)
    ,m_xFactory(_rxFactory)
#ifndef SYSTEM_MYSQL_CPPCONN
    ,m_hCppConnModule( NULL )
    ,m_bAttemptedLoadCppConn( false )
#endif
{
	OSL_TRACE("MysqlCDriver::MysqlCDriver");
	cppDriver = NULL;


void MysqlCDriver::impl_initCppConn_lck_throw()
{
#ifdef SYSTEM_MYSQL_CPPCONN
    cppDriver = get_driver_instance();
#else
    if ( !m_bAttemptedLoadCppConn )
    {
        const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB );
        m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
        m_bAttemptedLoadCppConn = true;
    }

    // attempted to load - was it successful?
    if ( !m_hCppConnModule )
    {
        OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
        throw SQLException(
            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ),
            *this,
            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ),  // "unable to connect"
            0,
            Any()
        );
    }

    // find the factory symbol
    const ::rtl::OUString sSymbolName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sql_mysql_get_driver_instance" ) );
	typedef void* (* FGetMySQLDriver)();

    const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
    if ( !pFactoryFunction )
    {
        OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
        throw SQLException(
            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ),
            *this,
            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ),  // "unable to connect"
            0,
            Any()
        );
    }

    cppDriver = static_cast< sql::Driver* >( (*pFactoryFunction)() );
#endif
    if ( !cppDriver )
    {
        throw SQLException(

Lines 66-75 namespace connectivity Link Here

(-)a/main/mysqlc/source/mysqlc_driver.hxx (-4 lines)
66	OWeakRefArray m_xConnections; // vector containing a list	66	OWeakRefArray m_xConnections; // vector containing a list
67	// of all the Connection objects	67	// of all the Connection objects
68	// for this Driver	68	// for this Driver
69	#ifndef SYSTEM_MYSQL_CPPCONN
70	oslModule m_hCppConnModule;
71	bool m_bAttemptedLoadCppConn;
72	#endif
73		69
74	sql::Driver * cppDriver;	70	sql::Driver * cppDriver;
75		71




#*************************************************************************
#
# 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.
#
#*************************************************************************

PRJNAME = mysqlcppconn
ENABLE_EXCEPTIONS = TRUE
USE_LDUMP2 = TRUE
EXTERNAL_WARNINGS_NOT_ERRORS = TRUE

CPPCONN_NATIVEAPI = cppconn_nativeapi




#*************************************************************************
#
# 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
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.22 $
#
# 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=mysqlcppconn
TARGET=so_mysqlcppconn

EXT_PROJECT_NAME=mysql-connector-cpp

# --- Settings -----------------------------------------------------

.INCLUDE :	settings.mk

# --- Files --------------------------------------------------------

TARFILE_NAME=$(EXT_PROJECT_NAME)
TARFILE_MD5=831126a1ee5af269923cfab6050769fe
ADDITIONAL_FILES=\
 				driver$/makefile.mk \
 				driver$/nativeapi$/makefile.mk \
 				driver$/nativeapi$/binding_config.h \
 				cppconn$/config.h

CONVERTFILES=\
				cppconn$/build_config.h

PATCH_FILES=\
    $(TARFILE_NAME).patch \
    patches/default_to_protocol_tcp.patch

BUILD_DIR=driver
BUILD_ACTION = \
            cd nativeapi \
         && $(MAKE) $(MFLAGS) $(CALLMACROS) \
         && cd .. \
         && $(MAKE) $(MFLAGS) $(CALLMACROS)

# --- Targets ------------------------------------------------------

.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk

# --- post-build ---------------------------------------------------

# "normalize" the output structure, in that the C/C++ headers are
# copied to the canonic location in OUTPATH
# The allows, later on, to use the standard mechanisms to deliver those
# files, instead of delivering them out of OUTPATH/misc/build/..., which
# could cause problems

NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)

$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
    -@$(MKDIRHIER) $(INCCOM)$/cppconn
    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)

normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)

$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize

Lines 1-385 Link Here

(-)a/main/mysqlcppconn/mysql-connector-cpp.patch




#*************************************************************************
#
# 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.
#
#*************************************************************************

.IF "$(SYSTEM_MYSQL)" == "YES"
  CFLAGS+=-DSYSTEM_MYSQL
.ELSE
  .IF "$(LIBMYSQL_PATH)" == ""
    alltar:
      @echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
      @force_dmake_to_error
  .ENDIF
.ENDIF

.IF "$(GUI)"=="WNT"

CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS

.ENDIF  # "$(GUI)"=="WNT"

.IF "$(SYSTEM_MYSQL)" != "YES"
    MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
.ENDIF

CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD


Lines 1-12 Link Here

(-)a/main/mysqlcppconn/patches/default_to_protocol_tcp.patch

Lines 1-3 Link Here

(-)a/main/mysqlcppconn/prj/build.lst (-3 lines)
1	my mysqlcppconn : solenv sal NULL
2	my mysqlcppconn nmake - all my_mkout NULL
3




# mirror the dir structure a make install would create
mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn

..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h
..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h

..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll

 ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%

Lines 55-61 fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz Link Here

(-)a/main/ooo.lst (-1 lines)
55	fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz	55	fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz
56	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz	56	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
57	37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip	57	37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip
58	831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
59	067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz	58	067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
60	cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2	59	cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
61	ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz	60	ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz

Return to issue 118594

Lines 3991-3996 if test -n "$with_system_mysql" -o -n "$with_system_libs" && \ Link Here

(-)a/main/configure.in (-9 / +5 lines)
3991	SYSTEM_MYSQL=YES	3991	SYSTEM_MYSQL=YES
3992	AC_PATH_PROG( MYSQLCONFIG, mysql_config)	3992	AC_PATH_PROG( MYSQLCONFIG, mysql_config)
3993	AC_MSG_CHECKING([MySQL version])	3993	AC_MSG_CHECKING([MySQL version])
		3994	if test -z "$MYSQLCONFIG" -o ! -x "$MYSQLCONFIG" ; then
		3995	AC_MSG_ERROR([can not find/execute mysql_config]);
		3996	fi
3994	MYSQL_VERSION=`$MYSQLCONFIG --version`	3997	MYSQL_VERSION=`$MYSQLCONFIG --version`
3995	MYSQL_MAJOR=`$MYSQLCONFIG --version \| cut -d"." -f1`	3998	MYSQL_MAJOR=`$MYSQLCONFIG --version \| cut -d"." -f1`
3996	if test "$MYSQL_MAJOR" -ge "5"; then	3999	if test "$MYSQL_MAJOR" -ge "5"; then
Lines 4064-4078 int main(int argc, char **argv) { Link Here
4064	AC_LANG_POP([C++])	4067	AC_LANG_POP([C++])
4065		4068
4066	else	4069	else
4067	AC_MSG_RESULT([internal])	4070	AC_MSG_RESULT([no])
4068	AC_MSG_CHECKING([for mysqlcppconn module])	4071	SYSTEM_MYSQL_CPPCONN=
4069	if test -d mysqlcppconn; then
4070	AC_MSG_RESULT([OK])
4071	else
4072	AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
4073	fi
4074	BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
4075	SYSTEM_MYSQL_CPPCONN=NO
4076	fi	4072	fi
4077	AC_LANG_POP([C++])	4073	AC_LANG_POP([C++])
4078	AC_SUBST(SYSTEM_MYSQL_CPPCONN)	4074	AC_SUBST(SYSTEM_MYSQL_CPPCONN)

Lines 112-120 CFLAGS+=-DSYSTEM_MYSQL_CPPCONN Link Here

(-)a/main/mysqlc/source/makefile.mk (-36 / +2 lines)
112	.ENDIF	112	.ENDIF
113		113
114	CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD	114	CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD
115	.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"	115	.IF "$(SYSTEM_MYSQL_CPPCONN)" == "YES"
116	CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\"
117	.ELSE
118	CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"	116	CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
119	.IF "$(USE_SYSTEM_STL)"!="YES"	117	.IF "$(USE_SYSTEM_STL)"!="YES"
120	CDEFS += -DADAPT_EXT_STL	118	CDEFS += -DADAPT_EXT_STL
Lines 122-133 CDEFS += -DADAPT_EXT_STL Link Here
122	.ENDIF	120	.ENDIF
123		121
124	# --------------- MySQL settings ------------------	122	# --------------- MySQL settings ------------------
125	.IF "$(GUI)"=="WNT"	123	.IF "$(GUI)"!="WNT"
126	MYSQL_INC=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn -I$(MYSQL_INCDIR)
127	MYSQL_LIB=$(MYSQL_LIBDIR)$/libmysql.lib
128	MYSQL_LIBFILE=$(MYSQL_LIBDIR)$/libmysql.dll
129	MYSQL_CPPCONNFILE=$(SOLARBINDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
130	.ELSE
131	.IF "$(SYSTEM_MYSQL)" != "YES"	124	.IF "$(SYSTEM_MYSQL)" != "YES"
132	MYSQL_INC+=-I$(MYSQL_INCDIR)	125	MYSQL_INC+=-I$(MYSQL_INCDIR)
133	.IF "$(OS)"=="MACOSX"	126	.IF "$(OS)"=="MACOSX"
Lines 140-159 CDEFS += -DADAPT_EXT_STL Link Here
140	EXTRALIBPATHS=-L$(MYSQL_LIBDIR)	133	EXTRALIBPATHS=-L$(MYSQL_LIBDIR)
141	.ENDIF	134	.ENDIF
142		135
143	.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
144	.IF "$(OS)"=="MACOSX" \|\| "$(OS)" == "SOLARIS"
145	MYSQL_LIB+=-lz -lm
146	.ELSE
147	MYSQL_LIB+=-rdynamic -lz -lcrypt -lnsl -lm
148	.ENDIF
149	MYSQL_CPPCONNFILE=$(SOLARLIBDIR)$/$(DLLPRE)mysqlcppconn$(DLLPOST)
150	.ELSE
151	MYSQL_CPPCONN_LIB+=-lmysqlcppconn	136	MYSQL_CPPCONN_LIB+=-lmysqlcppconn
152	.ENDIF
153	.ENDIF
154
155	.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
156	MYSQL_INC+=-I$(SOLARINCDIR)$/mysqlcppconn -I$(SOLARINCDIR)$/mysqlcppconn/cppconn
157	.ENDIF	137	.ENDIF
158		138
159	CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \	139	CFLAGS+=-I..$/..$/inc $(MYSQL_INC) \
Lines 258-267 EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES) $(COMPONENT_DESCRIPTIONS_PACK Link Here
258	EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_LIBFILE)	238	EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_LIBFILE)
259	.ENDIF	239	.ENDIF
260		240
261	.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
262	EXTENSION_PACKDEPS+=$(COMPONENT_MYSQL_CPPCONN_FILE)
263	.ENDIF
264
265	# --- Targets ------------------------------------------------------	241	# --- Targets ------------------------------------------------------
266	.INCLUDE : extension_pre.mk	242	.INCLUDE : extension_pre.mk
267	.INCLUDE : target.mk	243	.INCLUDE : target.mk
Lines 317-332 $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE) Link Here
317	.ENDIF	293	.ENDIF
318	.ENDIF	294	.ENDIF
319		295
320	.IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES"
321	# --- the MySQL cppconn lib needs to be copied
322	$(COMPONENT_MYSQL_CPPCONN_FILE): $(MYSQL_CPPCONNFILE)
323	@@-$(MKDIRHIER) $(@:d)
324	@$(COPY) $< $@ > $(NULLDEV)
325	.IF "$(OS)" == "MACOSX"
326	install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $@
327	.ENDIF
328	.ENDIF
329
330	.IF "$(OS)" == "MACOSX"	296	.IF "$(OS)" == "MACOSX"
331	$(EXTENSION_TARGET): adjust_libmysql_path	297	$(EXTENSION_TARGET): adjust_libmysql_path
332		298

Lines 40-48 using ::rtl::OUString; Link Here

(-)a/main/mysqlc/source/mysqlc_driver.cxx (-48 / +1 lines)
40		40
41	#include <preextstl.h>	41	#include <preextstl.h>
42	#include <cppconn/exception.h>	42	#include <cppconn/exception.h>
43	#ifdef SYSTEM_MYSQL_CPPCONN	43	#include <mysql_driver.h>
44	#include <mysql_driver.h>
45	#endif
46	#include <postextstl.h>	44	#include <postextstl.h>
47		45
48		46
Lines 50-59 using ::rtl::OUString; Link Here
50	MysqlCDriver::MysqlCDriver(const Reference< XMultiServiceFactory >& _rxFactory)	48	MysqlCDriver::MysqlCDriver(const Reference< XMultiServiceFactory >& _rxFactory)
51	: ODriver_BASE(m_aMutex)	49	: ODriver_BASE(m_aMutex)
52	,m_xFactory(_rxFactory)	50	,m_xFactory(_rxFactory)
53	#ifndef SYSTEM_MYSQL_CPPCONN
54	,m_hCppConnModule( NULL )
55	,m_bAttemptedLoadCppConn( false )
56	#endif
57	{	51	{
58	OSL_TRACE("MysqlCDriver::MysqlCDriver");	52	OSL_TRACE("MysqlCDriver::MysqlCDriver");
59	cppDriver = NULL;	53	cppDriver = NULL;
Lines 146-193 extern "C" { static void SAL_CALL thisModule() {} } Link Here
146		140
147	void MysqlCDriver::impl_initCppConn_lck_throw()	141	void MysqlCDriver::impl_initCppConn_lck_throw()
148	{	142	{
149	#ifdef SYSTEM_MYSQL_CPPCONN
150	cppDriver = get_driver_instance();	143	cppDriver = get_driver_instance();
151	#else
152	if ( !m_bAttemptedLoadCppConn )
153	{
154	const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB );
155	m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
156	m_bAttemptedLoadCppConn = true;
157	}
158
159	// attempted to load - was it successful?
160	if ( !m_hCppConnModule )
161	{
162	OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not load the " CPPCONN_LIB " library!");
163	throw SQLException(
164	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unable to load the " CPPCONN_LIB " library." ) ),
165	*this,
166	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
167	0,
168	Any()
169	);
170	}
171
172	// find the factory symbol
173	const ::rtl::OUString sSymbolName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sql_mysql_get_driver_instance" ) );
174	typedef void* (* FGetMySQLDriver)();
175
176	const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
177	if ( !pFactoryFunction )
178	{
179	OSL_ENSURE( false, "MysqlCDriver::impl_initCppConn_lck_throw: could not find the factory symbol in " CPPCONN_LIB "!");
180	throw SQLException(
181	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB " is invalid: missing the driver factory function." ) ),
182	*this,
183	::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "08001" ) ), // "unable to connect"
184	0,
185	Any()
186	);
187	}
188
189	cppDriver = static_cast< sql::Driver* >( (*pFactoryFunction)() );
190	#endif
191	if ( !cppDriver )	144	if ( !cppDriver )
192	{	145	{
193	throw SQLException(	146	throw SQLException(

Lines 1-33 Link Here

(-)a/main/mysqlcppconn/cppconn_config.pmk (-33 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2008 by Sun Microsystems, Inc.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	PRJNAME = mysqlcppconn
29	ENABLE_EXCEPTIONS = TRUE
30	USE_LDUMP2 = TRUE
31	EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
32
33	CPPCONN_NATIVEAPI = cppconn_nativeapi

Lines 1-91 Link Here

(-)a/main/mysqlcppconn/makefile.mk (-91 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2008 by Sun Microsystems, Inc.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# $RCSfile: makefile.mk,v $
10	#
11	# $Revision: 1.22 $
12	#
13	# This file is part of OpenOffice.org.
14	#
15	# OpenOffice.org is free software: you can redistribute it and/or modify
16	# it under the terms of the GNU Lesser General Public License version 3
17	# only, as published by the Free Software Foundation.
18	#
19	# OpenOffice.org is distributed in the hope that it will be useful,
20	# but WITHOUT ANY WARRANTY; without even the implied warranty of
21	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22	# GNU Lesser General Public License version 3 for more details
23	# (a copy is included in the LICENSE file that accompanied this code).
24	#
25	# You should have received a copy of the GNU Lesser General Public License
26	# version 3 along with OpenOffice.org. If not, see
27	# <http://www.openoffice.org/license.html>
28	# for a copy of the LGPLv3 License.
29	#
30	#*************************************************************************
31
32	PRJ=.
33
34	PRJNAME=mysqlcppconn
35	TARGET=so_mysqlcppconn
36
37	EXT_PROJECT_NAME=mysql-connector-cpp
38
39	# --- Settings -----------------------------------------------------
40
41	.INCLUDE : settings.mk
42
43	# --- Files --------------------------------------------------------
44
45	TARFILE_NAME=$(EXT_PROJECT_NAME)
46	TARFILE_MD5=831126a1ee5af269923cfab6050769fe
47	ADDITIONAL_FILES=\
48	driver$/makefile.mk \
49	driver$/nativeapi$/makefile.mk \
50	driver$/nativeapi$/binding_config.h \
51	cppconn$/config.h
52
53	CONVERTFILES=\
54	cppconn$/build_config.h
55
56	PATCH_FILES=\
57	$(TARFILE_NAME).patch \
58	patches/default_to_protocol_tcp.patch
59
60	BUILD_DIR=driver
61	BUILD_ACTION = \
62	cd nativeapi \
63	&& $(MAKE) $(MFLAGS) $(CALLMACROS) \
64	&& cd .. \
65	&& $(MAKE) $(MFLAGS) $(CALLMACROS)
66
67	# --- Targets ------------------------------------------------------
68
69	.INCLUDE : set_ext.mk
70	.INCLUDE : target.mk
71	.INCLUDE : tg_ext.mk
72
73	# --- post-build ---------------------------------------------------
74
75	# "normalize" the output structure, in that the C/C++ headers are
76	# copied to the canonic location in OUTPATH
77	# The allows, later on, to use the standard mechanisms to deliver those
78	# files, instead of delivering them out of OUTPATH/misc/build/..., which
79	# could cause problems
80
81	NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
82
83	$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
84	@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
85	-@$(MKDIRHIER) $(INCCOM)$/cppconn
86	@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
87	@$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
88
89	normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
90
91	$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize

Lines 1-49 Link Here

(-)a/main/mysqlcppconn/mysql_config.pmk (-49 lines)
1	#*************************************************************************
2	#
3	# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4	#
5	# Copyright 2008 by Sun Microsystems, Inc.
6	#
7	# OpenOffice.org - a multi-platform office productivity suite
8	#
9	# This file is part of OpenOffice.org.
10	#
11	# OpenOffice.org is free software: you can redistribute it and/or modify
12	# it under the terms of the GNU Lesser General Public License version 3
13	# only, as published by the Free Software Foundation.
14	#
15	# OpenOffice.org is distributed in the hope that it will be useful,
16	# but WITHOUT ANY WARRANTY; without even the implied warranty of
17	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	# GNU Lesser General Public License version 3 for more details
19	# (a copy is included in the LICENSE file that accompanied this code).
20	#
21	# You should have received a copy of the GNU Lesser General Public License
22	# version 3 along with OpenOffice.org. If not, see
23	# <http://www.openoffice.org/license.html>
24	# for a copy of the LGPLv3 License.
25	#
26	#*************************************************************************
27
28	.IF "$(SYSTEM_MYSQL)" == "YES"
29	CFLAGS+=-DSYSTEM_MYSQL
30	.ELSE
31	.IF "$(LIBMYSQL_PATH)" == ""
32	alltar:
33	@echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
34	@force_dmake_to_error
35	.ENDIF
36	.ENDIF
37
38	.IF "$(GUI)"=="WNT"
39
40	CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
41
42	.ENDIF # "$(GUI)"=="WNT"
43
44	.IF "$(SYSTEM_MYSQL)" != "YES"
45	MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
46	.ENDIF
47
48	CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
49

Lines 1-15 Link Here

(-)a/main/mysqlcppconn/prj/d.lst (-15 lines)
1	# mirror the dir structure a make install would create
2	mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
3	mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn
4
5	..\%__SRC%\inc\.h %_DEST%\inc%_EXT%\mysqlcppconn\.h
6	..\%__SRC%\inc\cppconn\.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\.h
7
8	..\%__SRC%\bin\.dll %_DEST%\bin%_EXT%\.dll
9
10	..\%__SRC%\lib\lib.so %_DEST%\lib%_EXT%
11	..\%__SRC%\lib\.sl %_DEST%\lib%_EXT%\.sl
12	..\%__SRC%\lib\.dylib %_DEST%\lib%_EXT%\.dylib
13	..\%__SRC%\lib\.dylib. %_DEST%\lib%_EXT%\.dylib.
14	..\%__SRC%\lib\.a %_DEST%\lib%_EXT%\.a
15	..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%