[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 8 commits - connectivity/AllLangResTarget_hsqldb.mk connectivity/Library_dbase.mk connectivity/Library_dbtools.mk connectivity/Library_evoab2.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Makefile connectivity/Module_connectivity.mk connectivity/source RepositoryExternal.mk Repository.mk
David Tardon
dtardon at kemper.freedesktop.org
Tue Mar 27 10:09:45 PDT 2012
Repository.mk | 1
RepositoryExternal.mk | 28 ++++-
connectivity/AllLangResTarget_hsqldb.mk | 47 +++++++++
connectivity/Library_dbase.mk | 1
connectivity/Library_dbtools.mk | 8 +
connectivity/Library_evoab2.mk | 9 +
connectivity/Library_file.mk | 1
connectivity/Library_flat.mk | 1
connectivity/Library_hsqldb.mk | 80 +++++++++++++++
connectivity/Library_jdbc.mk | 1
connectivity/Makefile | 2
connectivity/Module_connectivity.mk | 2
connectivity/source/drivers/hsqldb/makefile.mk | 126 -------------------------
13 files changed, 175 insertions(+), 132 deletions(-)
New commits:
commit 67b4a880e85476a5420e4278918c23da96375970
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 16:36:31 2012 +0200
connectivity: convert hsqldb
diff --git a/Repository.mk b/Repository.mk
index 49e04dc..4017476 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -163,6 +163,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwm \
guesslang \
helplinker \
+ hsqldb \
hwp \
hyphen \
i18npaper \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 324d206..42c7ba7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -922,6 +922,26 @@ $(call gb_LinkTarget_set_include,$(1),\
)
endef
+
+ifdef ($(SYSTEM_HSQLDB),YES)
+
+define gb_LinkTarget__use_hsqldb
+
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_HSQLDB \
+ -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\" \
+)
+
+endef
+
+else # !SYSTEM_HSQLDB
+
+define gb_LinkTarget__use_hsqldb
+
+endef
+
+endif # SYSTEM_HSQLDB
+
# MacOSX-only frameworks ############################################
# (in alphabetical order)
diff --git a/connectivity/AllLangResTarget_hsqldb.mk b/connectivity/AllLangResTarget_hsqldb.mk
new file mode 100644
index 0000000..923833d
--- /dev/null
+++ b/connectivity/AllLangResTarget_hsqldb.mk
@@ -0,0 +1,47 @@
+# -*- 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) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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_AllLangResTarget_AllLangResTarget,hsqldb))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
+
+$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\
+ database \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res))
+
+$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\
+ -I$(SRCDIR)/connectivity/source/drivers/hsqldb \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\
+ connectivity/source/drivers/hsqldb/hsqlui.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
new file mode 100644
index 0000000..fda6612
--- /dev/null
+++ b/connectivity/Library_hsqldb.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) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (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,hsqldb))
+
+$(eval $(call gb_Library_set_include,hsqldb,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_externals,hsqldb,\
+ hsqldb \
+))
+
+$(eval $(call gb_Library_add_api,hsqldb,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hsqldb,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ dbtools \
+ jvmfwk \
+ sal \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
+
+$(eval $(call gb_Library_add_exception_objects,hsqldb,\
+ connectivity/source/drivers/hsqldb/HCatalog \
+ connectivity/source/drivers/hsqldb/HColumns \
+ connectivity/source/drivers/hsqldb/HConnection \
+ connectivity/source/drivers/hsqldb/HDriver \
+ connectivity/source/drivers/hsqldb/HStorageAccess \
+ connectivity/source/drivers/hsqldb/HStorageMap \
+ connectivity/source/drivers/hsqldb/HTable \
+ connectivity/source/drivers/hsqldb/HTables \
+ connectivity/source/drivers/hsqldb/HTerminateListener \
+ connectivity/source/drivers/hsqldb/HTools \
+ connectivity/source/drivers/hsqldb/HUser \
+ connectivity/source/drivers/hsqldb/HUsers \
+ connectivity/source/drivers/hsqldb/HView \
+ connectivity/source/drivers/hsqldb/HViews \
+ connectivity/source/drivers/hsqldb/Hservices \
+ connectivity/source/drivers/hsqldb/StorageFileAccess \
+ connectivity/source/drivers/hsqldb/StorageNativeInputStream \
+ connectivity/source/drivers/hsqldb/StorageNativeOutputStream \
+ connectivity/source/drivers/hsqldb/accesslog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 6f242fd..fea6b15 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -45,8 +45,10 @@ $(eval $(call gb_Module_add_targets,connectivity,\
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,connectivity,\
+ AllLangResTarget_hsqldb \
Jar_ConnectivityTools \
Jar_sdbc_hsqldb \
+ Library_hsqldb \
Library_jdbc \
))
endif
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
deleted file mode 100755
index 6da440d..0000000
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ /dev/null
@@ -1,126 +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=hsqldb
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-.INCLUDE : $(PRJ)$/makefile.pmk
-.INCLUDE : $(PRJ)$/version.mk
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
- @echo "Not building jurt because Java is disabled"
-.ENDIF
-
-.IF "$(SYSTEM_HSQLDB)" == "YES"
-CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
-.ENDIF
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- hsqlui.src
-
-RES1FILELIST=\
- $(SRS)$/$(TARGET).srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(SOLARDEFIMG)$/database
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-# Note that the resource file built here is currently *not* included
-# in installation sets. See hsqlui.src for an explanation
-
-# --- Files -------------------------------------
-
-SLOFILES=\
- $(SLO)$/HStorageMap.obj \
- $(SLO)$/HStorageAccess.obj \
- $(SLO)$/HDriver.obj \
- $(SLO)$/HConnection.obj \
- $(SLO)$/HTerminateListener.obj \
- $(SLO)$/StorageNativeOutputStream.obj \
- $(SLO)$/StorageNativeInputStream.obj \
- $(SLO)$/StorageFileAccess.obj \
- $(SLO)$/HTables.obj \
- $(SLO)$/HTable.obj \
- $(SLO)$/HView.obj \
- $(SLO)$/HViews.obj \
- $(SLO)$/HCatalog.obj \
- $(SLO)$/HColumns.obj \
- $(SLO)$/HUser.obj \
- $(SLO)$/HUsers.obj \
- $(SLO)$/Hservices.obj \
- $(SLO)$/HTools.obj \
- $(SLO)$/accesslog.obj
-
-SHL1VERSIONMAP=$(HSQLDB_TARGET).map
-
-# --- Library -----------------------------------
-# NO $(DLLPOSTFIX) otherwise we have to find on which platform we are for the java files
-SHL1TARGET= $(HSQLDB_TARGET)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(DBTOOLSLIB) \
- $(JVMFWKLIB) \
- $(COMPHELPERLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB)
-
-
-SHL1DEPN=
-SHL1CREATEJNILIB=TRUE
-SHL1IMPLIB= i$(HSQLDB_TARGET)
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ----------------------------------
-
-.INCLUDE : $(PRJ)$/target.pmk
-
-.IF "$(depend)" == ""
-ALLTAR : $(MISC)/hsqldb.component
-.END
-
-$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- hsqldb.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt hsqldb.component
commit 9bd41e3f285057256f40c956b21cbd659453f974
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 16:04:08 2012 +0200
temp. band-aid for dep on yacc-generated header
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index da4995b..60432b9 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -160,4 +160,8 @@ $(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/resource/sharedresources \
))
+# TODO: this introduces a circular dep., but it does not matter, as the
+# underlying problem has already been fixed on master
+$(call gb_Library_get_headers_target,dbtools) : $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)
+
# vim: set noet sw=4 ts=4:
commit 82054fc88ea3755601e17a3d9d228e199e10d3d7
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 15:38:22 2012 +0200
ensure headers are in place before compiling
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 223cf8d..da4995b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Library_Library,dbtools))
+$(eval $(call gb_Library_add_package_headers,dbtools,\
+ connectivity_inc \
+))
+
$(eval $(call gb_Library_add_defs,dbtools,\
-DOOO_DLLIMPLEMENTATION_DBTOOLS \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
commit 85c583f05938cbf6138c54343e85f3615109ef44
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 15:12:41 2012 +0200
add missing linked lib
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
index f1e9ffd..7c867b1 100644
--- a/connectivity/Library_evoab2.mk
+++ b/connectivity/Library_evoab2.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_api,evoab2,\
))
$(eval $(call gb_Library_add_linked_libs,evoab2,\
+ comphelper \
cppu \
cppuhelper \
svl \
commit 768e406fe4bef1b27555271a6f76d31224f0e125
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 15:12:14 2012 +0200
add missing include paths
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index 69b3490..11c9432 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,dbase,\
$$(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,dbase,\
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
index e36b15a..f1e9ffd 100644
--- a/connectivity/Library_evoab2.mk
+++ b/connectivity/Library_evoab2.mk
@@ -27,6 +27,12 @@
$(eval $(call gb_Library_Library,evoab2))
+$(eval $(call gb_Library_set_include,evoab2,\
+ -I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_externals,evoab2,\
gtk \
gobject \
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index e91f747..727b5ce 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_set_include,file,\
$$(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_api,file,\
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index c69623a..6dbd862 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,flat,\
$$(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,flat,\
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 19628d4..d244ec6 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,jdbc,\
$$(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,jdbc,\
commit c5b76f03550c07bb12c55981c963512054b92296
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 14:51:20 2012 +0200
fix library name
diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk
index df85d58..e36b15a 100644
--- a/connectivity/Library_evoab2.mk
+++ b/connectivity/Library_evoab2.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,evoab2,\
sal \
salhelper \
dbtools \
- dbfile \
+ file \
$(gb_STDLIBS) \
))
commit 1883feb810db9e15f400063673d38e89e9bccb2a
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 14:43:42 2012 +0200
too many parentheses
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 231ffda..324d206 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -903,23 +903,23 @@ endif # SYSTEM_CURL
define gb_LinkTarget__use_kde
$(call gb_LinkTarget_add_libs,$(1),\
$(KDE_LIBS) \
-))
+)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(KDE_CFLAGS) \
-))
+)
endef
define gb_LinkTarget__use_gobject
$(call gb_LinkTarget_add_libs,$(1),\
$(GOBJECT_LIBS) \
-))
+)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(GOBJECT_CFLAGS) \
-))
+)
endef
# MacOSX-only frameworks ############################################
commit 75c8a9f962e72d4dd12bf20d855d1dced986f509
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 27 14:34:12 2012 +0200
update Makefile
diff --git a/connectivity/Makefile b/connectivity/Makefile
index 076fe8d..51104dc 100644
--- a/connectivity/Makefile
+++ b/connectivity/Makefile
@@ -31,10 +31,10 @@ ifeq ($(strip $(SOLARENV)),)
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
else
+gb_SourceEnvAndRecurse_STAGE=gbuild
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
endif
-
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list