Thu Dec 22 16:55:05 PST 2011

Repository.mk                                 |    1 
 connectivity/Library_ado.mk                   |    2 
 connectivity/Library_calc.mk                  |    4 -
 connectivity/Library_dbpool2.mk               |    3 
 connectivity/Library_dbtools.mk               |    3 
 connectivity/Library_evoab2.mk                |    2 
 connectivity/Library_kab1.mk                  |    2 
 connectivity/Library_kabdrv1.mk               |    2 
 connectivity/Library_macab1.mk                |    2 
 connectivity/Library_macabdrv1.mk             |    2 
 connectivity/Library_mysql.mk                 |   63 +++++++++++++++++
 connectivity/Library_odbc.mk                  |    3 
 connectivity/Library_odbcbase.mk              |    5 -
 connectivity/Library_sdbc2.mk                 |    7 +
 connectivity/Module_connectivity.mk           |    1 
 connectivity/prj/build.lst                    |    1 
 connectivity/source/drivers/mysql/exports.dxp |    1 
 connectivity/source/drivers/mysql/makefile.mk |   92 --------------------------
 18 files changed, 77 insertions(+), 119 deletions(-)

New commits:
commit b79e0281febf24c43a5de229e7295e623b68db84
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Thu Dec 22 19:49:48 2011 -0500

    connectivity: convert mysql to gbuild

diff --git a/Repository.mk b/Repository.mk
index 507b5b6..cab2117 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -189,6 +189,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     msfilter \
     msword \
 	msworks \
+	mysql \
 	odfflatxml \
     offacc \
 	pdffilter \
diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk
new file mode 100644
index 0000000..9838b14
--- /dev/null
+++ b/connectivity/Library_mysql.mk
@@ -0,0 +1,63 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,mysql))
+
+$(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
+
+$(eval $(call gb_Library_add_api,mysql,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_set_include,mysql,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mysql,\
+	cppu \
+	cppuhelper \
+	sal \
+	dbtools \
+	comphelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mysql,\
+	connectivity/source/drivers/mysql/YDriver \
+	connectivity/source/drivers/mysql/YTables \
+	connectivity/source/drivers/mysql/YTable \
+	connectivity/source/drivers/mysql/YViews \
+	connectivity/source/drivers/mysql/YCatalog \
+	connectivity/source/drivers/mysql/YColumns \
+	connectivity/source/drivers/mysql/YUser \
+	connectivity/source/drivers/mysql/YUsers \
+	connectivity/source/drivers/mysql/Yservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 88118d4..5b80a53 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_calc \
 	Library_odbcbase \
 	Library_odbc \
+	Library_mysql \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 4e8e8b0..030caee 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -2,7 +2,6 @@ cn  connectivity    :    shell  TRANSLATIONS:translations comphelper MOZ:moz POS
 cn  connectivity\source\drivers\mozab\mozillasrc    nmake   -   all cn_mozab_mozillasrc cn_file cn_inc NULL
 cn  connectivity\source\drivers\mozab\bootstrap     nmake   -   all cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
 cn  connectivity\source\drivers\mozab               nmake   -   all cn_mozab cn_mozab_bootstrap cn_dbtools cn_inc NULL
-cn  connectivity\source\drivers\mysql               nmake   -   all cn_mysql cn_dbtools cn_inc NULL
 cn  connectivity\source\drivers\postgresql          nmake   -   all cn_postgresql cn_dbtools cn_inc NULL
 cn  connectivity\source\drivers\jdbc                nmake   -   all cn_jdbc cn_dbtools cn_inc NULL
 cn  connectivity\source\drivers\file                nmake   -   all cn_file cn_dbtools cn_inc NULL
diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/connectivity/source/drivers/mysql/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
deleted file mode 100755
index 453f4b6..0000000
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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=..$/..$/..
-PRJINC=..$/..
-PRJNAME=connectivity
-TARGET=mysql
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE :  $(PRJ)$/version.mk
-
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-        $(SLO)$/YDriver.obj				\
-        $(SLO)$/YTables.obj				\
-        $(SLO)$/YTable.obj				\
-        $(SLO)$/YViews.obj				\
-        $(SLO)$/YCatalog.obj			\
-        $(SLO)$/YColumns.obj			\
-        $(SLO)$/YUser.obj				\
-        $(SLO)$/YUsers.obj				\
-        $(SLO)$/Yservices.obj
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Library -----------------------------------
-
-SHL1TARGET=	$(MYSQL_TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
-    $(CPPULIB)					\
-    $(CPPUHELPERLIB)			\
-    $(SALLIB)					\
-    $(DBTOOLSLIB)				\
-    $(COMPHELPERLIB)
-
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(MYSQL_TARGET)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-
-
-ALLTAR : $(MISC)/mysql.component
-
-$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        mysql.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt mysql.component
commit a3b61359a336ec0455c8e2552c6cd39dbce1aab0
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Thu Dec 22 19:47:22 2011 -0500

    connectivity: fix circular deps

diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 492a7e2..5cb183f 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,ado))
 
-$(eval $(call gb_Library_add_package_headers,ado,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
 
 $(eval $(call gb_Library_add_api,ado,\
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 3fa6baa..8fe95bb 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,calc))
 
-$(eval $(call gb_Library_add_package_headers,calc,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
 $(eval $(call gb_Library_add_api,calc,\
@@ -38,7 +36,9 @@ $(eval $(call gb_Library_add_api,calc,\
 
 $(eval $(call gb_Library_set_include,calc,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,calc,\
diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk
index c2418f2..821a229 100644
--- a/connectivity/Library_dbpool2.mk
+++ b/connectivity/Library_dbpool2.mk
@@ -29,10 +29,9 @@ $(eval $(call gb_Library_Library,dbpool2))
 
 $(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2))
 
-$(eval $(call gb_Library_add_package_headers,dbpool2,connectivity_inc))
-
 $(eval $(call gb_Library_set_include,dbpool2,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index a98fd2f..223cf8d 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -32,12 +32,11 @@ $(eval $(call gb_Library_add_defs,dbtools,\
 	-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
 
-$(eval $(call gb_Library_add_package_headers,dbtools,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
 
 $(eval $(call gb_Library_set_include,dbtools,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
index 62fe736..df85d58 100644
--- a/connectivity/Library_evoab2.mk
+++ b/connectivity/Library_evoab2.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,evoab2))
 
-$(eval $(call gb_Library_add_package_headers,evoab2,connectivity_inc))
-
 $(eval $(call gb_Library_use_externals,evoab2,\
 	gtk \
 	gobject \
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index c4f503c..6df1d79 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,kab1))
 
-$(eval $(call gb_Library_add_package_headers,kab1,connectivity_inc))
-
 $(eval $(call gb_Library_use_externals,kab1,kde))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index 2885ef9..5613cbc 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,kabdrv1))
 
-$(eval $(call gb_Library_add_package_headers,kabdrv1,connectivity_inc))
-
 $(eval $(call gb_Library_add_api,kabdrv1,\
 	offapi \
 	udkapi \
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index 39cc460..1024764 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,macab1))
 
-$(eval $(call gb_Library_add_package_headers,macab1,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
 $(eval $(call gb_Library_add_api,macab1,\
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index d69963a..3582735 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
-$(eval $(call gb_Library_add_package_headers,macabdrv1,connectivity_inc))
-
 $(eval $(call gb_Library_add_api,macabdrv1,\
 	offapi \
 	udkapi \
diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk
index 6744bb7..ee10b80 100644
--- a/connectivity/Library_odbc.mk
+++ b/connectivity/Library_odbc.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,odbc))
 
-$(eval $(call gb_Library_add_package_headers,odbc,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
 
 $(eval $(call gb_Library_add_api,odbc,\
@@ -38,6 +36,7 @@ $(eval $(call gb_Library_add_api,odbc,\
 
 $(eval $(call gb_Library_set_include,odbc,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index b41b437..b328545 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -27,9 +27,6 @@
 
 $(eval $(call gb_Library_Library,odbcbase))
 
-$(eval $(call gb_Library_add_package_headers,odbcbase,connectivity_inc))
-
-
 $(eval $(call gb_Library_add_api,odbcbase,\
 	offapi \
 	udkapi \
@@ -37,7 +34,9 @@ $(eval $(call gb_Library_add_api,odbcbase,\
 
 $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
+	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_add_defs,odbcbase,\
diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk
index 59a2900..59ec716 100644
--- a/connectivity/Library_sdbc2.mk
+++ b/connectivity/Library_sdbc2.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,sdbc2))
 
-$(eval $(call gb_Library_add_package_headers,sdbc2,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
 
@@ -37,6 +35,11 @@ $(eval $(call gb_Library_add_api,sdbc2,\
 	udkapi \
 ))
 
+$(eval $(call gb_Library_set_include,sdbc2,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sdbc2,\
 	cppu \
 	cppuhelper \
