[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 4 commits - connectivity/Library_dbase.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_jdbc.mk connectivity/Module_connectivity.mk connectivity/prj connectivity/source Repository.mk
Peter Foley
pefoley2 at kemper.freedesktop.org
Tue Dec 27 15:29:16 PST 2011
Repository.mk | 3
connectivity/Library_dbase.mk | 80 +++++++++++
connectivity/Library_file.mk | 84 +++++++++++
connectivity/Library_flat.mk | 71 +++++++++
connectivity/Library_jdbc.mk | 89 ++++++++++++
connectivity/Module_connectivity.mk | 4
connectivity/prj/build.lst | 4
connectivity/source/drivers/dbase/dbase.mxp.map | 171 ------------------------
connectivity/source/drivers/dbase/exports.dxp | 1
connectivity/source/drivers/dbase/makefile.mk | 137 -------------------
connectivity/source/drivers/file/makefile.mk | 108 ---------------
connectivity/source/drivers/flat/exports.dxp | 1
connectivity/source/drivers/flat/flat.mxp.map | 139 -------------------
connectivity/source/drivers/flat/makefile.mk | 115 ----------------
connectivity/source/drivers/jdbc/exports.dxp | 1
connectivity/source/drivers/jdbc/jdbc.mxp.map | 152 ---------------------
connectivity/source/drivers/jdbc/makefile.mk | 120 ----------------
17 files changed, 331 insertions(+), 949 deletions(-)
New commits:
commit 16bc7087753600c7dabe6ea23352df2bc57b8798
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Dec 25 12:05:01 2011 -0500
connectivity: convert dbase to gbuild
diff --git a/Repository.mk b/Repository.mk
index 8220131..49e04dc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -127,6 +127,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cppcanvas \
cui \
dba \
+ dbase \
dbaxml \
dbmm \
dbpool2 \
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
new file mode 100644
index 0000000..69b3490
--- /dev/null
+++ b/connectivity/Library_dbase.mk
@@ -0,0 +1,80 @@
+# -*- 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,dbase))
+
+$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
+
+$(eval $(call gb_Library_add_api,dbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_include,dbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbase,\
+ cppu \
+ cppuhelper \
+ svl \
+ tl \
+ ucbhelper \
+ sal \
+ salhelper \
+ dbtools \
+ file \
+ utl \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DCode \
+ connectivity/source/drivers/dbase/DResultSet \
+ connectivity/source/drivers/dbase/DStatement \
+ connectivity/source/drivers/dbase/DPreparedStatement \
+ connectivity/source/drivers/dbase/dindexnode \
+ connectivity/source/drivers/dbase/DIndexIter \
+ connectivity/source/drivers/dbase/DDatabaseMetaData \
+ connectivity/source/drivers/dbase/DCatalog \
+ connectivity/source/drivers/dbase/DColumns \
+ connectivity/source/drivers/dbase/DIndexColumns \
+ connectivity/source/drivers/dbase/DIndex \
+ connectivity/source/drivers/dbase/DIndexes \
+ connectivity/source/drivers/dbase/DTables \
+ connectivity/source/drivers/dbase/DConnection \
+ connectivity/source/drivers/dbase/Dservices \
+ connectivity/source/drivers/dbase/DDriver \
+ connectivity/source/drivers/dbase/DTable \
+))
+
+#connectivity/source/drivers/dbase/DTable disable optimization?
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 5b6db0f..6f242fd 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_mysql \
Library_file \
Library_flat \
+ Library_dbase \
))
ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 3c4c346..f63d0fe 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -3,7 +3,6 @@ cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_moz
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\postgresql nmake - all cn_postgresql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_flat cn_dbase cn_hsqldb cn_macab NULL
diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map
deleted file mode 100755
index 57a9142..0000000
--- a/connectivity/source/drivers/dbase/dbase.mxp.map
+++ /dev/null
@@ -1,171 +0,0 @@
-component_getFactory
-__mh_dylib_header
-___builtin_delete
-___builtin_vec_delete
-___builtin_vec_new
-___check_eh_spec
-___cp_pop_exception
-___cp_push_exception
-___eh_alloc
-___get_eh_context
-___pure_virtual
-___rtti_class
-___rtti_si
-___rtti_user
-___sjthrow
-___start_cp_handler
-___terminate
-_terminate__Fv
-dyld_stub_binding_helper
-rest_world
-save_world
-___builtin_new
-___eh_rtime_match
-___tf9bad_alloc
-__._10bad_typeid
-__._8bad_cast
-___get_eh_info
-___is_pointer__FPv
-___throw_type_match_rtti
-___vt_10bad_typeid
-___vt_8bad_cast
-__keymgr_get_per_thread_data
-__keymgr_set_per_thread_data
-___tf9exception
-___ti9exception
-___vt_9exception
-_what__C9exception
-__._9bad_alloc
-___vt_9bad_alloc
-__._9type_info
-___eq__C9type_infoRCB0
-___tf16__user_type_info
-___tf9type_info
-___ti9type_info
-___vt_9type_info
-_getPropertySetInfo__Q312connectivity5dbase15ODbaseResultSet
-_release__Q312connectivity5dbase15ODbaseResultSet
-_acquire__Q312connectivity5dbase15ODbaseResultSet
-__._Q312connectivity5dbase15ODbaseResultSet
-__._Q312connectivity5dbase15ODbaseStatement
-__._Q312connectivity5dbase23ODbasePreparedStatement
-_IsText__Q312connectivity5dbase7ONDXKeyl
-_Write__CQ312connectivity5dbase8ONDXNodeR8SvStreamRCQ312connectivity5dbase8ONDXPage
-_Read__Q312connectivity5dbase8ONDXNodeR8SvStreamRQ312connectivity5dbase11ODbaseIndex
-_Merge__Q312connectivity5dbase8ONDXPageUsGQ312connectivity5dbase11ONDXPagePtr
-_Remove__Q312connectivity5dbase8ONDXPageUs
-_SearchAndReplace__Q312connectivity5dbase8ONDXPageRCQ312connectivity5dbase7ONDXKeyRB1
-_Search__Q312connectivity5dbase8ONDXPageRCQ312connectivity5dbase7ONDXKey
-_FindPos__CQ312connectivity5dbase8ONDXPageRCQ312connectivity5dbase7ONDXKey
-_ReleaseFull__Q312connectivity5dbase8ONDXPageUc
-_Append__Q312connectivity5dbase8ONDXPageRQ312connectivity5dbase8ONDXNode
-_Split__Q312connectivity5dbase8ONDXPageRB0
-_Insert__Q312connectivity5dbase8ONDXPageUsRQ312connectivity5dbase8ONDXNode
-_IsFull__CQ312connectivity5dbase8ONDXPage
-___vc__CQ312connectivity5dbase8ONDXPageUs
-___ls__Q212connectivity5dbaseR8SvStreamRCQ312connectivity5dbase8ONDXPage
-__._Q312connectivity5dbase8ONDXPage
-_GetFirstKey__Q312connectivity5dbase14OIndexIteratorPQ312connectivity5dbase8ONDXPageRCQ312connectivity4file8OOperand
-_GetCompare__Q312connectivity5dbase14OIndexIteratorUc
-_GetLike__Q312connectivity5dbase14OIndexIteratorUc
-_GetNull__Q312connectivity5dbase14OIndexIteratorUc
-_GetNotNull__Q312connectivity5dbase14OIndexIteratorUc
-_GetNextKey__Q312connectivity5dbase14OIndexIterator
-_Find__Q312connectivity5dbase14OIndexIteratorUc
-_refreshTables__Q312connectivity5dbase13ODbaseCatalog
-__._Q312connectivity5dbase18UStringDescription
-___Q312connectivity5dbase18UStringDescriptionPFv_PCc
-__._Q312connectivity5dbase11ODbaseIndex
-_release__Q312connectivity5dbase11ODbaseIndex
-_acquire__Q312connectivity5dbase11ODbaseIndex
-_createINFEntry__Q312connectivity5dbase11ODbaseIndex
-_getEntry__Q312connectivity5dbase11ODbaseIndex
-___ls__Q212connectivity5dbaseR8SvStreamRQ312connectivity5dbase11ODbaseIndex
-_Release__Q312connectivity5dbase11ODbaseIndexUc
-_ConvertToKey__Q312connectivity5dbase11ODbaseIndexPQ312connectivity5dbase7ONDXKeyUlRCQ312connectivity4file12ORowSetValue
-_openIndexFile__Q312connectivity5dbase11ODbaseIndex
-__._Q312connectivity5dbase11ODbaseTable
-_WriteMemo__Q312connectivity5dbase11ODbaseTableRQ312connectivity4file12ORowSetValueRUl
-_isUniqueByColumnName__Q312connectivity5dbase11ODbaseTableRCQ23rtl8OUString
-_WriteBuffer__Q312connectivity5dbase11ODbaseTable
-_UpdateBuffer__Q312connectivity5dbase11ODbaseTableRQ312connectivity4file12OValueVectorGQ23vost4ORef1ZB1RCQ53com3sun4star3unot9Reference1ZQ53com3sun4star9container12XIndexAccess
-_CreateMemoFile__Q312connectivity5dbase11ODbaseTableRC13INetURLObject
-_CreateFile__Q312connectivity5dbase11ODbaseTableRC13INetURLObjectRUc
-_ReadMemo__Q312connectivity5dbase11ODbaseTableUlRQ312connectivity4file12ORowSetValue
-_refreshIndexes__Q312connectivity5dbase11ODbaseTable
-_refreshColumns__Q312connectivity5dbase11ODbaseTable
-_AllocBuffer__Q312connectivity5dbase11ODbaseTable
-_fillColumns__Q312connectivity5dbase11ODbaseTable
-_ReadMemoHeader__Q312connectivity5dbase11ODbaseTable
-_readHeader__Q312connectivity5dbase11ODbaseTable
-_getPropertySetInfo__Q312connectivity4file26ODatabaseMetaDataResultSet
-_release__Q312connectivity4file26ODatabaseMetaDataResultSet
-_acquire__Q312connectivity4file26ODatabaseMetaDataResultSet
-_getPropertySetInfo__Q312connectivity4file10OResultSet
-_release__Q312connectivity4file10OResultSet
-_acquire__Q312connectivity4file10OResultSet
-_scanParameter__Q312connectivity4file10OResultSetPQ212connectivity13OSQLParseNodeRQ24_STLt6vector2ZPB1ZQ24_STLt9allocator1ZPB1
-_AddParameter__Q312connectivity4file10OResultSetPQ212connectivity13OSQLParseNodeRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star5beans12XPropertySet
-_SetAssignValue__Q312connectivity4file10OResultSetRC6Stringn1UcUl
-_ParseAssignValues__Q312connectivity4file10OResultSetRCQ24_STLt6vector2Z6StringZQ24_STLt9allocator1ZB2PQ212connectivity13OSQLParseNodeUs
-_getUnoTunnelImplementationId__Q312connectivity4file10OResultSet
-_setOrderbyColumn__Q312connectivity4file10OResultSetUsPQ212connectivity13OSQLParseNoden1
-_CreateKeySet__Q312connectivity4file14OFILESortIndex
-___Q312connectivity4file14OFILESortIndexPCQ312connectivity4file8OKeyTypePCUclUs
-_anylizeSQL__Q312connectivity4file10OResultSet
-_GetAssignValues__Q312connectivity4file10OResultSet
-_moveAbsolute__Q312connectivity4file10OResultSetlUc
-_ExecuteRow__Q312connectivity4file10OResultSetQ412connectivity4file10OFileTable12FilePositionlUcn2
-_AddKeyValue__Q312connectivity4file14OFILESortIndexPQ312connectivity4file13OFILEKeyValue
-_GetOrderbyKeyValue__Q312connectivity4file10OResultSetGQ23vost4ORef1ZQ312connectivity4file12OValueVector
-_evaluate__Q312connectivity4file10OResultSet
-_SkipDeleted__Q312connectivity4file10OResultSetQ412connectivity4file10OFileTable12FilePositionlUc
-__._Q312connectivity4file14OFILESortIndex
-_construct__Q312connectivity4file10OResultSet
-_isCount__CQ312connectivity4file10OResultSet
-__._Q312connectivity4file18UStringDescription
-___Q312connectivity4file18UStringDescriptionPFv_PCc
-_disposing__Q312connectivity4file15OStatement_Base
-_acquire__Q312connectivity4file15OStatement_Base
-__._Q312connectivity4file16OStatement_BASE2
-__._Q312connectivity4file10OStatement
-_disposeResultSet__Q312connectivity4file15OStatement_Base
-_getImplementationName_Static__Q312connectivity4file11OFileDriver
-_operate__CQ312connectivity4file8OOp_LIKEPCQ312connectivity4file8OOperandn1
-_operate__CQ312connectivity4file10OOp_ISNULLPCQ312connectivity4file8OOperandn1
-_IsOf__Q312connectivity4file12ONumOperatorPFv_Pv
-_StaticType__Q312connectivity4file12ONumOperator
-_IsOf__Q312connectivity4file11OOp_COMPAREPFv_Pv
-_IsOf__Q312connectivity4file11OOp_NOTLIKEPFv_Pv
-_StaticType__Q312connectivity4file11OOp_NOTLIKE
-_IsOf__Q312connectivity4file8OOp_LIKEPFv_Pv
-_IsOf__Q312connectivity4file13OOp_ISNOTNULLPFv_Pv
-_IsOf__Q312connectivity4file10OOp_ISNULLPFv_Pv
-_IsOf__Q312connectivity4file6OOp_ORPFv_Pv
-_StaticType__Q312connectivity4file6OOp_OR
-_IsOf__Q312connectivity4file7OOp_ANDPFv_Pv
-_StaticType__Q312connectivity4file7OOp_AND
-_IsOf__Q312connectivity4file13OBoolOperatorPFv_Pv
-_IsOf__Q312connectivity4file9OOperatorPFv_Pv
-_IsOf__Q312connectivity4file14OOperandResultPFv_Pv
-_IsOf__Q312connectivity4file13OOperandConstPFv_Pv
-_IsOf__Q312connectivity4file13OOperandValuePFv_Pv
-_StaticType__Q312connectivity4file13OOperandValue
-_IsOf__Q312connectivity4file13OOperandParamPFv_Pv
-_IsOf__Q312connectivity4file16OFILEOperandAttrPFv_Pv
-_StaticType__Q312connectivity4file16OFILEOperandAttr
-_IsOf__Q312connectivity4file12OOperandAttrPFv_Pv
-_IsOf__Q312connectivity4file11OOperandRowPFv_Pv
-_StaticType__Q312connectivity4file11OOperandRow
-_IsOf__Q312connectivity4file8OOperandPFv_Pv
-_IsOf__Q312connectivity4file5OCodePFv_Pv
-_StaticType__Q312connectivity4file5OCode
-_execute_Operand__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_ISNULL__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_LIKE__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_COMPARE__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-___tf13bad_exception
-___uncatch_exception
-___eh_free
-___tfv
-___dynamic_cast
diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/connectivity/source/drivers/dbase/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
deleted file mode 100755
index 5c3344b..0000000
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ /dev/null
@@ -1,137 +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=dbase
-
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/DCode.obj \
- $(SLO)$/DResultSet.obj \
- $(SLO)$/DStatement.obj \
- $(SLO)$/DPreparedStatement.obj \
- $(SLO)$/dindexnode.obj \
- $(SLO)$/DIndexIter.obj \
- $(SLO)$/DDatabaseMetaData.obj \
- $(SLO)$/DCatalog.obj \
- $(SLO)$/DColumns.obj \
- $(SLO)$/DIndexColumns.obj \
- $(SLO)$/DIndex.obj \
- $(SLO)$/DIndexes.obj \
- $(SLO)$/DTable.obj \
- $(SLO)$/DTables.obj \
- $(SLO)$/DConnection.obj \
- $(SLO)$/Dservices.obj \
- $(SLO)$/DDriver.obj
-
-EXCEPTIONSFILES=\
- $(SLO)$/DCode.obj \
- $(SLO)$/DResultSet.obj \
- $(SLO)$/DStatement.obj \
- $(SLO)$/DPreparedStatement.obj \
- $(SLO)$/dindexnode.obj \
- $(SLO)$/DIndexIter.obj \
- $(SLO)$/DDatabaseMetaData.obj \
- $(SLO)$/DCatalog.obj \
- $(SLO)$/DColumns.obj \
- $(SLO)$/DIndexColumns.obj \
- $(SLO)$/DIndex.obj \
- $(SLO)$/DIndexes.obj \
- $(SLO)$/DTables.obj \
- $(SLO)$/DConnection.obj \
- $(SLO)$/Dservices.obj \
- $(SLO)$/DDriver.obj
-
-# [kh] ppc linux gcc compiler problem
-.IF "$(OS)$(COM)$(CPUNAME)"=="LINUXGCCPOWERPC"
-EXCEPTIONSNOOPTFILES= \
- $(SLO)$/DTable.obj
-.ELSE
-EXCEPTIONSFILES +=\
- $(SLO)$/DTable.obj
-.ENDIF
-
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(DBTOOLSLIB) \
- $(DBFILELIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB)
-
-.IF "$(DBFILELIB)" == ""
-SHL1STDLIBS+= ifile.lib
-.ENDIF
-
-SHL1DEPN=
-SHL1IMPLIB= i$(DBASE_TARGET)
-
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-
-
-ALLTAR : $(MISC)/dbase.component
-
-$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- dbase.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt dbase.component
commit 3f19d61f991aa6258cb927c8d30a41eb08d6dcfa
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Dec 25 11:54:34 2011 -0500
connectivity: convert flat to gbuild
diff --git a/Repository.mk b/Repository.mk
index 87124be..8220131 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -152,6 +152,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
filterconfig \
filtertracer \
flash \
+ flat \
for \
frm \
fwe \
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
new file mode 100644
index 0000000..c69623a
--- /dev/null
+++ b/connectivity/Library_flat.mk
@@ -0,0 +1,71 @@
+# -*- 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,flat))
+
+$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
+
+$(eval $(call gb_Library_add_api,flat,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_include,flat,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,flat,\
+ cppu \
+ cppuhelper \
+ tl \
+ svl \
+ utl \
+ sal \
+ salhelper \
+ dbtools \
+ file \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,flat,\
+ connectivity/source/drivers/flat/EResultSet \
+ connectivity/source/drivers/flat/EStatement \
+ connectivity/source/drivers/flat/EPreparedStatement \
+ connectivity/source/drivers/flat/ETable \
+ connectivity/source/drivers/flat/EDatabaseMetaData \
+ connectivity/source/drivers/flat/ECatalog \
+ connectivity/source/drivers/flat/EColumns \
+ connectivity/source/drivers/flat/ETables \
+ connectivity/source/drivers/flat/EConnection \
+ connectivity/source/drivers/flat/Eservices \
+ connectivity/source/drivers/flat/EDriver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index c3d5262..5b6db0f 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_odbc \
Library_mysql \
Library_file \
+ Library_flat \
))
ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 1ae87d5..3c4c346 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -3,7 +3,6 @@ cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_moz
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\postgresql nmake - all cn_postgresql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
commit 8c2276d35e1365de98d966e10dc8be099e8a4e5d
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Dec 25 11:40:33 2011 -0500
connectivity: convert file to gbuild
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
new file mode 100644
index 0000000..e91f747
--- /dev/null
+++ b/connectivity/Library_file.mk
@@ -0,0 +1,84 @@
+# -*- 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,file))
+
+$(eval $(call gb_Library_add_defs,file,\
+ -DOOO_DLLIMPLEMENTATION_FILE \
+))
+
+$(eval $(call gb_Library_set_include,file,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,file,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,file,\
+ cppu \
+ cppuhelper \
+ svl \
+ tl \
+ ucbhelper \
+ sal \
+ salhelper \
+ dbtools \
+ utl \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,file,\
+ connectivity/source/drivers/file/quotedstring \
+))
+
+$(eval $(call gb_Library_add_exception_objects,file,\
+ connectivity/source/drivers/file/FCatalog \
+ connectivity/source/drivers/file/FColumns \
+ connectivity/source/drivers/file/FConnection \
+ connectivity/source/drivers/file/FDatabaseMetaData \
+ connectivity/source/drivers/file/FDateFunctions \
+ connectivity/source/drivers/file/FDriver \
+ connectivity/source/drivers/file/FNoException \
+ connectivity/source/drivers/file/FNumericFunctions \
+ connectivity/source/drivers/file/FPreparedStatement \
+ connectivity/source/drivers/file/FResultSet \
+ connectivity/source/drivers/file/FResultSetMetaData \
+ connectivity/source/drivers/file/FStatement \
+ connectivity/source/drivers/file/FStringFunctions \
+ connectivity/source/drivers/file/FTable \
+ connectivity/source/drivers/file/FTables \
+ connectivity/source/drivers/file/fanalyzer \
+ connectivity/source/drivers/file/fcode \
+ connectivity/source/drivers/file/fcomp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 0f54826..c3d5262 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_odbcbase \
Library_odbc \
Library_mysql \
+ Library_file \
))
ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index dd7ca11..1ae87d5 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -3,7 +3,6 @@ cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_moz
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\postgresql nmake - all cn_postgresql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
deleted file mode 100755
index 41f061d..0000000
--- a/connectivity/source/drivers/file/makefile.mk
+++ /dev/null
@@ -1,108 +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=file
-
-USE_DEFFILE=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-CDEFS += -DOOO_DLLIMPLEMENTATION_FILE
-
-# --- Files -------------------------------------
-EXCEPTIONSFILES=\
- $(SLO)$/FCatalog.obj \
- $(SLO)$/FColumns.obj \
- $(SLO)$/FConnection.obj \
- $(SLO)$/FDatabaseMetaData.obj \
- $(SLO)$/FDateFunctions.obj \
- $(SLO)$/FDriver.obj \
- $(SLO)$/FNoException.obj \
- $(SLO)$/FNumericFunctions.obj \
- $(SLO)$/FPreparedStatement.obj \
- $(SLO)$/FResultSet.obj \
- $(SLO)$/FResultSetMetaData.obj \
- $(SLO)$/FStatement.obj \
- $(SLO)$/FStringFunctions.obj \
- $(SLO)$/FTable.obj \
- $(SLO)$/FTables.obj \
- $(SLO)$/fanalyzer.obj \
- $(SLO)$/fcode.obj \
- $(SLO)$/fcomp.obj
-
-SLOFILES=\
- $(EXCEPTIONSFILES) \
- $(SLO)$/quotedstring.obj
-
-
-# --- Library -----------------------------------
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(DBTOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \
- $(SLB)$/$(TARGET).lib
-DEFLIB1NAME=$(TARGET)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-# --- filter file ------------------------------
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo _TI >$@
- @echo _real >>$@
-
diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/connectivity/source/drivers/flat/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map
deleted file mode 100755
index 9a6cbf9..0000000
--- a/connectivity/source/drivers/flat/flat.mxp.map
+++ /dev/null
@@ -1,139 +0,0 @@
-component_getFactory
-__mh_dylib_header
-___builtin_delete
-___builtin_vec_delete
-___builtin_vec_new
-___check_eh_spec
-___cp_pop_exception
-___cp_push_exception
-___eh_alloc
-___get_eh_context
-___pure_virtual
-___rtti_class
-___rtti_si
-___rtti_user
-___sjthrow
-___start_cp_handler
-___terminate
-_terminate__Fv
-dyld_stub_binding_helper
-rest_world
-save_world
-___eh_rtime_match
-___builtin_new
-___tf9bad_alloc
-__._10bad_typeid
-__._8bad_cast
-___get_eh_info
-___is_pointer__FPv
-___throw_type_match_rtti
-___vt_10bad_typeid
-___vt_8bad_cast
-__keymgr_get_per_thread_data
-__keymgr_set_per_thread_data
-___tf9exception
-___ti9exception
-___vt_9exception
-_what__C9exception
-__._9bad_alloc
-___vt_9bad_alloc
-__._9type_info
-___eq__C9type_infoRCB0
-___tf16__user_type_info
-___tf9type_info
-___ti9type_info
-___vt_9type_info
-__._Q312connectivity4flat18UStringDescription
-___Q312connectivity4flat18UStringDescriptionPFv_PCc
-_getPropertySetInfo__Q312connectivity4flat14OFlatResultSet
-_release__Q312connectivity4flat14OFlatResultSet
-_acquire__Q312connectivity4flat14OFlatResultSet
-__._Q312connectivity4flat14OFlatResultSet
-__._Q312connectivity4flat14OFlatStatement
-__._Q312connectivity4flat22OFlatPreparedStatement
-__._Q312connectivity4flat10OFlatTable
-_toDouble__FRC10ByteString
-_checkHeaderLine__Q312connectivity4flat10OFlatTable
-_refreshColumns__Q312connectivity4flat10OFlatTable
-_AllocBuffer__Q312connectivity4flat10OFlatTable
-_fillColumns__Q312connectivity4flat10OFlatTable
-_getEntry__Q312connectivity4flat10OFlatTable
-_GetToken__CQ312connectivity4flat11OFlatStringUsUcUc
-_GetTokenCount__CQ312connectivity4flat11OFlatStringUcUc
-_refreshTables__Q312connectivity4flat12OFlatCatalog
-_getPropertySetInfo__Q312connectivity4file26ODatabaseMetaDataResultSet
-_release__Q312connectivity4file26ODatabaseMetaDataResultSet
-_acquire__Q312connectivity4file26ODatabaseMetaDataResultSet
-_getPropertySetInfo__Q312connectivity4file10OResultSet
-_release__Q312connectivity4file10OResultSet
-_acquire__Q312connectivity4file10OResultSet
-_scanParameter__Q312connectivity4file10OResultSetPQ212connectivity13OSQLParseNodeRQ24_STLt6vector2ZPB1ZQ24_STLt9allocator1ZPB1
-_AddParameter__Q312connectivity4file10OResultSetPQ212connectivity13OSQLParseNodeRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star5beans12XPropertySet
-_SetAssignValue__Q312connectivity4file10OResultSetRC6Stringn1UcUl
-_ParseAssignValues__Q312connectivity4file10OResultSetRCQ24_STLt6vector2Z6StringZQ24_STLt9allocator1ZB2PQ212connectivity13OSQLParseNodeUs
-_getUnoTunnelImplementationId__Q312connectivity4file10OResultSet
-_setOrderbyColumn__Q312connectivity4file10OResultSetUsPQ212connectivity13OSQLParseNoden1
-_CreateKeySet__Q312connectivity4file14OFILESortIndex
-___Q312connectivity4file14OFILESortIndexPCQ312connectivity4file8OKeyTypePCUclUs
-_anylizeSQL__Q312connectivity4file10OResultSet
-_GetAssignValues__Q312connectivity4file10OResultSet
-_moveAbsolute__Q312connectivity4file10OResultSetlUc
-_ExecuteRow__Q312connectivity4file10OResultSetQ412connectivity4file10OFileTable12FilePositionlUcn2
-_AddKeyValue__Q312connectivity4file14OFILESortIndexPQ312connectivity4file13OFILEKeyValue
-_GetOrderbyKeyValue__Q312connectivity4file10OResultSetGQ23vost4ORef1ZQ312connectivity4file12OValueVector
-_evaluate__Q312connectivity4file10OResultSet
-_SkipDeleted__Q312connectivity4file10OResultSetQ412connectivity4file10OFileTable12FilePositionlUc
-__._Q312connectivity4file14OFILESortIndex
-_construct__Q312connectivity4file10OResultSet
-_isCount__CQ312connectivity4file10OResultSet
-__._Q312connectivity4file18UStringDescription
-___Q312connectivity4file18UStringDescriptionPFv_PCc
-_disposing__Q312connectivity4file15OStatement_Base
-_acquire__Q312connectivity4file15OStatement_Base
-__._Q312connectivity4file16OStatement_BASE2
-__._Q312connectivity4file10OStatement
-_disposeResultSet__Q312connectivity4file15OStatement_Base
-_getImplementationName_Static__Q312connectivity4file11OFileDriver
-_operate__CQ312connectivity4file8OOp_LIKEPCQ312connectivity4file8OOperandn1
-_operate__CQ312connectivity4file10OOp_ISNULLPCQ312connectivity4file8OOperandn1
-_IsOf__Q312connectivity4file12ONumOperatorPFv_Pv
-_StaticType__Q312connectivity4file12ONumOperator
-_IsOf__Q312connectivity4file11OOp_COMPAREPFv_Pv
-_StaticType__Q312connectivity4file11OOp_COMPARE
-_IsOf__Q312connectivity4file11OOp_NOTLIKEPFv_Pv
-_StaticType__Q312connectivity4file11OOp_NOTLIKE
-_IsOf__Q312connectivity4file8OOp_LIKEPFv_Pv
-_StaticType__Q312connectivity4file8OOp_LIKE
-_IsOf__Q312connectivity4file13OOp_ISNOTNULLPFv_Pv
-_StaticType__Q312connectivity4file13OOp_ISNOTNULL
-_IsOf__Q312connectivity4file10OOp_ISNULLPFv_Pv
-_StaticType__Q312connectivity4file10OOp_ISNULL
-_IsOf__Q312connectivity4file6OOp_ORPFv_Pv
-_StaticType__Q312connectivity4file6OOp_OR
-_IsOf__Q312connectivity4file7OOp_ANDPFv_Pv
-_StaticType__Q312connectivity4file7OOp_AND
-_IsOf__Q312connectivity4file13OBoolOperatorPFv_Pv
-_IsOf__Q312connectivity4file9OOperatorPFv_Pv
-_IsOf__Q312connectivity4file14OOperandResultPFv_Pv
-_IsOf__Q312connectivity4file13OOperandConstPFv_Pv
-_IsOf__Q312connectivity4file13OOperandValuePFv_Pv
-_StaticType__Q312connectivity4file13OOperandValue
-_IsOf__Q312connectivity4file13OOperandParamPFv_Pv
-_IsOf__Q312connectivity4file16OFILEOperandAttrPFv_Pv
-_StaticType__Q312connectivity4file16OFILEOperandAttr
-_IsOf__Q312connectivity4file12OOperandAttrPFv_Pv
-_IsOf__Q312connectivity4file11OOperandRowPFv_Pv
-_StaticType__Q312connectivity4file11OOperandRow
-_IsOf__Q312connectivity4file8OOperandPFv_Pv
-_IsOf__Q312connectivity4file5OCodePFv_Pv
-_StaticType__Q312connectivity4file5OCode
-__._Q312connectivity4file5OCode
-_execute_Operand__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_ISNULL__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_LIKE__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-_execute_COMPARE__Q312connectivity4file18OPredicateCompilerPQ212connectivity13OSQLParseNode
-___tf13bad_exception
-___uncatch_exception
-___eh_free
-___tfv
-___dynamic_cast
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
deleted file mode 100755
index 0fe8579..0000000
--- a/connectivity/source/drivers/flat/makefile.mk
+++ /dev/null
@@ -1,115 +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=flat
-
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/EResultSet.obj \
- $(SLO)$/EStatement.obj \
- $(SLO)$/EPreparedStatement.obj \
- $(SLO)$/ETable.obj \
- $(SLO)$/EDatabaseMetaData.obj \
- $(SLO)$/ECatalog.obj \
- $(SLO)$/EColumns.obj \
- $(SLO)$/ETables.obj \
- $(SLO)$/EConnection.obj \
- $(SLO)$/Eservices.obj \
- $(SLO)$/EDriver.obj
-
-EXCEPTIONSFILES=\
- $(SLO)$/EResultSet.obj \
- $(SLO)$/EStatement.obj \
- $(SLO)$/EPreparedStatement.obj \
- $(SLO)$/ETable.obj \
- $(SLO)$/EDatabaseMetaData.obj \
- $(SLO)$/ECatalog.obj \
- $(SLO)$/EColumns.obj \
- $(SLO)$/ETables.obj \
- $(SLO)$/EConnection.obj \
- $(SLO)$/Eservices.obj \
- $(SLO)$/EDriver.obj
-
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Library -----------------------------------
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(DBTOOLSLIB) \
- $(DBFILELIB) \
- $(COMPHELPERLIB)
-
-.IF "$(DBFILELIB)" == ""
-SHL1STDLIBS+= ifile.lib
-.ENDIF
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-
-
-ALLTAR : $(MISC)/flat.component
-
-$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- flat.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt flat.component
commit ce806fbe64b96e3b7adf84ad72c1950976c7a775
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Dec 25 11:16:20 2011 -0500
connectivity: convert jdbc to gbuild
diff --git a/Repository.mk b/Repository.mk
index cab2117..87124be 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -177,6 +177,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
ira \
itg \
iti \
+ jdbc \
kab1 \
kabdrv1 \
lng \
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
new file mode 100644
index 0000000..19628d4
--- /dev/null
+++ b/connectivity/Library_jdbc.mk
@@ -0,0 +1,89 @@
+# -*- 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,jdbc))
+
+$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
+
+$(eval $(call gb_Library_add_api,jdbc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_include,jdbc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jdbc,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ jvmaccess \
+ dbtools \
+ utl \
+ jvmfwk \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,jdbc,\
+ connectivity/source/drivers/jdbc/Array \
+ connectivity/source/drivers/jdbc/Blob \
+ connectivity/source/drivers/jdbc/Boolean \
+ connectivity/source/drivers/jdbc/CallableStatement \
+ connectivity/source/drivers/jdbc/Class \
+ connectivity/source/drivers/jdbc/Clob \
+ connectivity/source/drivers/jdbc/ConnectionLog \
+ connectivity/source/drivers/jdbc/DatabaseMetaData \
+ connectivity/source/drivers/jdbc/Date \
+ connectivity/source/drivers/jdbc/DriverPropertyInfo \
+ connectivity/source/drivers/jdbc/Exception \
+ connectivity/source/drivers/jdbc/InputStream \
+ connectivity/source/drivers/jdbc/JConnection \
+ connectivity/source/drivers/jdbc/JDriver \
+ connectivity/source/drivers/jdbc/JStatement \
+ connectivity/source/drivers/jdbc/Object \
+ connectivity/source/drivers/jdbc/PreparedStatement \
+ connectivity/source/drivers/jdbc/Reader \
+ connectivity/source/drivers/jdbc/Ref \
+ connectivity/source/drivers/jdbc/ResultSet \
+ connectivity/source/drivers/jdbc/ResultSetMetaData \
+ connectivity/source/drivers/jdbc/SQLException \
+ connectivity/source/drivers/jdbc/SQLWarning \
+ connectivity/source/drivers/jdbc/String \
+ connectivity/source/drivers/jdbc/Throwable \
+ connectivity/source/drivers/jdbc/Timestamp \
+ connectivity/source/drivers/jdbc/jservices \
+ connectivity/source/drivers/jdbc/JBigDecimal \
+ connectivity/source/drivers/jdbc/tools \
+ connectivity/source/drivers/jdbc/ContextClassLoader \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 30071ad..0f54826 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -44,6 +44,7 @@ ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
Jar_ConnectivityTools \
Jar_sdbc_hsqldb \
+ Library_jdbc \
))
endif
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 030caee..dd7ca11 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -3,7 +3,6 @@ cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_moz
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\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
cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map
deleted file mode 100755
index 2437d90..0000000
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ /dev/null
@@ -1,152 +0,0 @@
-component_getFactory
-__mh_dylib_header
-___builtin_delete
-___check_eh_spec
-___cp_pop_exception
-___get_eh_context
-___pure_virtual
-___rtti_class
-___rtti_si
-___rtti_user
-___sjthrow
-___start_cp_handler
-___terminate
-dyld_stub_binding_helper
-rest_world
-save_world
-___builtin_new
-___builtin_vec_delete
-___builtin_vec_new
-___cp_push_exception
-___eh_alloc
-_terminate__Fv
-___eh_rtime_match
-__._10bad_typeid
-__._8bad_cast
-___get_eh_info
-___is_pointer__FPv
-___throw_type_match_rtti
-___vt_10bad_typeid
-___vt_8bad_cast
-__keymgr_get_per_thread_data
-__keymgr_set_per_thread_data
-___tf9exception
-___ti9exception
-___vt_9exception
-_what__C9exception
-__._9bad_alloc
-___tf9bad_alloc
-___vt_9bad_alloc
-__._9type_info
-___eq__C9type_infoRCB0
-___tf16__user_type_info
-___tf9type_info
-___ti9type_info
-___vt_9type_info
-_getMyClass__Q212connectivity14java_sql_Array
-_saveClassRef__Q212connectivity14java_sql_ArrayP7_jclass
-_getMyClass__Q212connectivity13java_sql_Blob
-_saveClassRef__Q212connectivity13java_sql_BlobP7_jclass
-_saveClassRef__Q212connectivity17java_lang_BooleanP7_jclass
-__._Q212connectivity26java_sql_CallableStatement
-_release__Q212connectivity26java_sql_CallableStatement
-_acquire__Q212connectivity26java_sql_CallableStatement
-_saveClassRef__Q212connectivity26java_sql_CallableStatementP7_jclass
-_getMyClass__Q212connectivity26java_sql_CallableStatement
-_getMyClass__Q212connectivity15java_lang_Class
-_saveClassRef__Q212connectivity15java_lang_ClassP7_jclass
-_getMyClass__Q212connectivity13java_sql_Clob
-_saveClassRef__Q212connectivity13java_sql_ClobP7_jclass
-_getMyClass__Q212connectivity19java_sql_Connection
-_saveClassRef__Q212connectivity19java_sql_ConnectionP7_jclass
-_getMyClass__Q212connectivity25java_sql_DatabaseMetaData
-_saveClassRef__Q212connectivity25java_sql_DatabaseMetaDataP7_jclass
-_saveClassRef__Q212connectivity14java_util_DateP7_jclass
-_getMyClass__Q212connectivity14java_util_Date
-_getMyClass__Q212connectivity22java_sql_DriverManager
-_saveClassRef__Q212connectivity22java_sql_DriverManagerP7_jclass
-_choices__CQ212connectivity27java_sql_DriverPropertyInfo
-_value__CQ212connectivity27java_sql_DriverPropertyInfo
-_required__CQ212connectivity27java_sql_DriverPropertyInfo
-_description__CQ212connectivity27java_sql_DriverPropertyInfo
-_name__CQ212connectivity27java_sql_DriverPropertyInfo
-_saveClassRef__Q212connectivity27java_sql_DriverPropertyInfoP7_jclass
-_saveClassRef__Q212connectivity19java_lang_ExceptionP7_jclass
-_getMyClass__Q212connectivity19java_io_InputStream
-_saveClassRef__Q212connectivity19java_io_InputStreamP7_jclass
-_getMyClass__Q212connectivity15java_sql_Driver
-_saveClassRef__Q212connectivity15java_sql_DriverP7_jclass
-___Q212connectivity15java_sql_DriverRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_getMyClass__Q212connectivity16java_lang_Object
-_setError__Q212connectivity15SDBThreadAttach
-_StartJava__Q212connectivity15SDBThreadAttachRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_xInit__Q212connectivity15SDBThreadAttachRCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_detachThread__Q212connectivity15SDBThreadAttach
-_attachThread__Q212connectivity15SDBThreadAttachRP7JNIEnv_RCQ53com3sun4star3unot9Reference1ZQ53com3sun4star4lang20XMultiServiceFactory
-_release__Q212connectivity26java_sql_PreparedStatement
-_acquire__Q212connectivity26java_sql_PreparedStatement
-_getMyClass__Q212connectivity26java_sql_PreparedStatement
-_saveClassRef__Q212connectivity26java_sql_PreparedStatementP7_jclass
-_getMyClass__Q212connectivity14java_io_Reader
-_saveClassRef__Q212connectivity14java_io_ReaderP7_jclass
-_getMyClass__Q212connectivity12java_sql_Ref
-_saveClassRef__Q212connectivity12java_sql_RefP7_jclass
-__._Q312connectivity4jdbc18UStringDescription
-___Q312connectivity4jdbc18UStringDescriptionPFv_PCc
-_getPropertySetInfo__Q212connectivity18java_sql_ResultSet
-_release__Q212connectivity18java_sql_ResultSet
-_acquire__Q212connectivity18java_sql_ResultSet
-_getResultSetType__CQ212connectivity18java_sql_ResultSet
-_getResultSetConcurrency__CQ212connectivity18java_sql_ResultSet
-_getCursorName__CQ212connectivity18java_sql_ResultSet
-_setFetchSize__Q212connectivity18java_sql_ResultSetl
-_setFetchDirection__Q212connectivity18java_sql_ResultSetl
-_getFetchSize__CQ212connectivity18java_sql_ResultSet
-_getFetchDirection__CQ212connectivity18java_sql_ResultSet
-_saveClassRef__Q212connectivity18java_sql_ResultSetP7_jclass
-_getMyClass__Q212connectivity18java_sql_ResultSet
-_getMyClass__Q212connectivity26java_sql_ResultSetMetaData
-_saveClassRef__Q212connectivity26java_sql_ResultSetMetaDataP7_jclass
-_saveClassRef__Q212connectivity26java_sql_SQLException_BASEP7_jclass
-_getNextException__CQ212connectivity26java_sql_SQLException_BASE
-_getErrorCode__CQ212connectivity26java_sql_SQLException_BASE
-_getSQLState__CQ212connectivity26java_sql_SQLException_BASE
-_saveClassRef__Q212connectivity24java_sql_SQLWarning_BASEP7_jclass
-_disposing__Q212connectivity23java_sql_Statement_Base
-_release__Q212connectivity23java_sql_Statement_Base
-_acquire__Q212connectivity23java_sql_Statement_Base
-__._Q212connectivity16OStatement_BASE2
-_release__Q212connectivity18java_sql_Statement
-_acquire__Q212connectivity18java_sql_Statement
-_saveClassRef__Q212connectivity18java_sql_StatementP7_jclass
-_setFetchSize__Q212connectivity23java_sql_Statement_Basel
-_setFetchDirection__Q212connectivity23java_sql_Statement_Basel
-_setResultSetType__Q212connectivity23java_sql_Statement_Basel
-_setResultSetConcurrency__Q212connectivity23java_sql_Statement_Basel
-_setCursorName__Q212connectivity23java_sql_Statement_BaseRCQ23rtl8OUString
-_setMaxRows__Q212connectivity23java_sql_Statement_Basel
-_setMaxFieldSize__Q212connectivity23java_sql_Statement_Basel
-_setQueryTimeOut__Q212connectivity23java_sql_Statement_Basel
-_getFetchSize__CQ212connectivity23java_sql_Statement_Base
-_getFetchDirection__CQ212connectivity23java_sql_Statement_Base
-_getResultSetType__CQ212connectivity23java_sql_Statement_Base
-_getResultSetConcurrency__CQ212connectivity23java_sql_Statement_Base
-_getCursorName__CQ212connectivity23java_sql_Statement_Base
-_getMaxRows__CQ212connectivity23java_sql_Statement_Base
-_getMaxFieldSize__CQ212connectivity23java_sql_Statement_Base
-_getQueryTimeOut__CQ212connectivity23java_sql_Statement_Base
-_getMyClass__Q212connectivity18java_sql_Statement
-_saveClassRef__Q212connectivity23java_sql_Statement_BaseP7_jclass
-_getMyClass__Q212connectivity23java_sql_Statement_Base
-_saveClassRef__Q212connectivity16java_lang_StringP7_jclass
-_saveClassRef__Q212connectivity19java_lang_ThrowableP7_jclass
-_getMyClass__Q212connectivity18java_sql_Timestamp
-_saveClassRef__Q212connectivity18java_sql_TimestampP7_jclass
-_getMyClass__Q212connectivity13java_sql_Time
-_saveClassRef__Q212connectivity13java_sql_TimeP7_jclass
-_saveClassRef__Q212connectivity13java_sql_DateP7_jclass
-___tf13bad_exception
-___uncatch_exception
-___eh_free
-___tfv
-___dynamic_cast
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
deleted file mode 100755
index befdc73..0000000
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ /dev/null
@@ -1,120 +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=jdbc
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-
-.IF "$(SOLAR_JAVA)" != ""
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/Array.obj \
- $(SLO)$/Blob.obj \
- $(SLO)$/Boolean.obj \
- $(SLO)$/CallableStatement.obj \
- $(SLO)$/Class.obj \
- $(SLO)$/Clob.obj \
- $(SLO)$/ConnectionLog.obj \
- $(SLO)$/DatabaseMetaData.obj \
- $(SLO)$/Date.obj \
- $(SLO)$/DriverPropertyInfo.obj \
- $(SLO)$/Exception.obj \
- $(SLO)$/InputStream.obj \
- $(SLO)$/JConnection.obj \
- $(SLO)$/JDriver.obj \
- $(SLO)$/JStatement.obj \
- $(SLO)$/Object.obj \
- $(SLO)$/PreparedStatement.obj \
- $(SLO)$/Reader.obj \
- $(SLO)$/Ref.obj \
- $(SLO)$/ResultSet.obj \
- $(SLO)$/ResultSetMetaData.obj \
- $(SLO)$/SQLException.obj \
- $(SLO)$/SQLWarning.obj \
- $(SLO)$/String.obj \
- $(SLO)$/Throwable.obj \
- $(SLO)$/Timestamp.obj \
- $(SLO)$/jservices.obj \
- $(SLO)$/JBigDecimal.obj \
- $(SLO)$/tools.obj \
- $(SLO)$/ContextClassLoader.obj
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Library -----------------------------------
-
-SHL1TARGET= $(JDBC_TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(JVMACCESSLIB) \
- $(DBTOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(JVMFWKLIB) \
- $(COMPHELPERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(JDBC_TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-.ENDIF # SOLAR_JAVA
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-
-
-ALLTAR : $(MISC)/jdbc.component
-
-$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- jdbc.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt jdbc.component
More information about the Libreoffice-commits
mailing list