[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 2 commits - connectivity/Library_calc.mk connectivity/Library_odbcbase.mk connectivity/Module_connectivity.mk connectivity/prj connectivity/source Repository.mk
Peter Foley
pefoley2 at kemper.freedesktop.org
Thu Dec 22 15:21:57 PST 2011
Repository.mk | 2
connectivity/Library_calc.mk | 72 ++++++++++++++++
connectivity/Library_odbcbase.mk | 75 +++++++++++++++++
connectivity/Module_connectivity.mk | 2
connectivity/prj/build.lst | 2
connectivity/source/drivers/calc/exports.dxp | 1
connectivity/source/drivers/calc/makefile.mk | 99 -----------------------
connectivity/source/drivers/odbcbase/makefile.mk | 90 --------------------
8 files changed, 151 insertions(+), 192 deletions(-)
New commits:
commit 886ece774cd94313df4941ad338f9cf186c3e9cc
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Dec 22 18:11:04 2011 -0500
connectivity: convert odbcbase to gbuild
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
new file mode 100644
index 0000000..b41b437
--- /dev/null
+++ b/connectivity/Library_odbcbase.mk
@@ -0,0 +1,75 @@
+# -*- 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,odbcbase))
+
+$(eval $(call gb_Library_add_package_headers,odbcbase,connectivity_inc))
+
+
+$(eval $(call gb_Library_add_api,odbcbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_include,odbcbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,odbcbase,\
+ -DOOO_DLLIMPLEMENTATION_ODBCBASE \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_defs,odbcbase,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,odbcbase,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ dbtools \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbcbase,\
+ connectivity/source/drivers/odbcbase/OPreparedStatement \
+ connectivity/source/drivers/odbcbase/OStatement \
+ connectivity/source/drivers/odbcbase/OResultSetMetaData \
+ connectivity/source/drivers/odbcbase/OResultSet \
+ connectivity/source/drivers/odbcbase/OTools \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaData \
+ connectivity/source/drivers/odbcbase/ODriver \
+ connectivity/source/drivers/odbcbase/OConnection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 8c095e3..e6ad773 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_sdbc2 \
Library_dbpool2 \
Library_calc \
+ Library_odbcbase \
))
ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 7848dca..c6c840f 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\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase 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
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
deleted file mode 100755
index 85e96ea..0000000
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ /dev/null
@@ -1,90 +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=odbcbase
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/version.mk
-
-CDEFS += -DOOO_DLLIMPLEMENTATION_ODBCBASE
-
-.IF "$(SYSTEM_ODBC_HEADERS)" == "YES"
-CFLAGS+=-DSYSTEM_ODBC_HEADERS
-.ENDIF
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/OPreparedStatement.obj \
- $(SLO)$/OStatement.obj \
- $(SLO)$/OResultSetMetaData.obj \
- $(SLO)$/OResultSet.obj \
- $(SLO)$/OTools.obj \
- $(SLO)$/ODatabaseMetaDataResultSet.obj \
- $(SLO)$/ODatabaseMetaData.obj \
- $(SLO)$/ODriver.obj \
- $(SLO)$/OConnection.obj
-
-# --- ODBC BASE Library -----------------------------------
-
-SHL1TARGET= $(ODBC2_TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(DBTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SALHELPERLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(ODBC2_TARGET)
-SHL1USE_EXPORTS=name
-
-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 CLEAR_THE_FILE > $@
commit 0e3533fe9342eb103d3fadd7c74203ff4256e0f2
Author: Peter Foley <pefoley2 at verizon.net>
Date: Thu Dec 22 16:59:41 2011 -0500
connectivity: convert calc to gbuild
diff --git a/Repository.mk b/Repository.mk
index 3774dc1..507b5b6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
avmedia \
avmediaQuickTime \
basegfx \
+ calc \
chartcontroller \
chartmodel \
charttools \
@@ -147,6 +148,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
eti \
evoab2 \
exp \
+ file \
filterconfig \
filtertracer \
flash \
diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
new file mode 100644
index 0000000..3fa6baa
--- /dev/null
+++ b/connectivity/Library_calc.mk
@@ -0,0 +1,72 @@
+# -*- 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,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,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_set_include,calc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,calc,\
+ cppu \
+ cppuhelper \
+ svl \
+ tl \
+ utl \
+ sal \
+ salhelper \
+ dbtools \
+ file \
+ comphelper \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,calc,\
+ connectivity/source/drivers/calc/CResultSet \
+ connectivity/source/drivers/calc/CStatement \
+ connectivity/source/drivers/calc/CPreparedStatement \
+ connectivity/source/drivers/calc/CDatabaseMetaData \
+ connectivity/source/drivers/calc/CCatalog \
+ connectivity/source/drivers/calc/CColumns \
+ connectivity/source/drivers/calc/CTable \
+ connectivity/source/drivers/calc/CTables \
+ connectivity/source/drivers/calc/CConnection \
+ connectivity/source/drivers/calc/Cservices \
+ connectivity/source/drivers/calc/CDriver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index c479250..8c095e3 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_dbtools \
Library_sdbc2 \
Library_dbpool2 \
+ Library_calc \
))
ifneq ($(SOLAR_JAVA),)
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 45d5dc5..7848dca 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\calc nmake - all cn_calc cn_file cn_inc NULL
cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/connectivity/source/drivers/calc/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
deleted file mode 100755
index d36438a..0000000
--- a/connectivity/source/drivers/calc/makefile.mk
+++ /dev/null
@@ -1,99 +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=calc
-
-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)$/CResultSet.obj \
- $(SLO)$/CStatement.obj \
- $(SLO)$/CPreparedStatement.obj \
- $(SLO)$/CDatabaseMetaData.obj \
- $(SLO)$/CCatalog.obj \
- $(SLO)$/CColumns.obj \
- $(SLO)$/CTable.obj \
- $(SLO)$/CTables.obj \
- $(SLO)$/CConnection.obj \
- $(SLO)$/Cservices.obj \
- $(SLO)$/CDriver.obj
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(DBTOOLSLIB) \
- $(DBFILELIB) \
- $(COMPHELPERLIB)
-
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-
-
-ALLTAR : $(MISC)/calc.component
-
-$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- calc.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt calc.component
More information about the Libreoffice-commits
mailing list