connectivity: convert mozab (hopefully .-)

2012-04-05 17:59:36 +02:00
parent 727fe75571
commit c678a4cbf2
6 changed files with 355 additions and 0 deletions
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,6 +307,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	macabdrv1 \
 	MacOSXSpell \
    merged \
+    mozabdrv \
+    mozbootstrap \
    msfilter \
    msword \
 	mysql \
@@ -520,6 +522,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
    lomenubar \
    migrationoo2 \
    migrationoo3 \
+    mozab2 \
    msforms \
    mtfrenderer \
    nullcanvas \
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1293,6 +1293,142 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\

 endif # SYSTEM_POSTGRESQL

+
+ifeq ($(SYSTEM_MOZILLA),YES)
+
+# Nothing needed here ATM
+define gb_LinkTarget__use_mozilla
+
+endef
+
+else # !SYSTEM_MOZILLA
+
+define gb_LinkTarget__use_mozilla
+
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DMOZILLA_INTERNAL_API \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(foreach subdir,\
+		addrbook \
+		chrome \
+		content \
+		embed_base \
+		intl \
+		locale \
+		mime \
+		mork \
+		mozldap \
+		msgbase \
+		necko \
+		nspr \
+		pref \
+		profile \
+		rdf \
+		string \
+		uconv \
+		xpcom \
+		xpcom_obsolete \
+		,-I$(OUTDIR_FOR_BUILD)/inc/mozilla/$(subdir)) \
+)
+
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	nspr4 \
+	xpcom \
+	xpcom_core \
+)
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+	embed_base_s \
+	mozreg_s \
+)
+
+ifeq ($(GUI),WNT)
+
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DMOZILLA_CLIENT \
+	-DMOZ_REFLOW_PERF \
+	-DMOZ_REFLOW_PERF_DSP \
+	-DMOZ_XUL \
+	-DOJI \
+	-DWIN32 \
+	-DXP_PC \
+	-DXP_WIN \
+	-DXP_WIN32 \
+	-D_WINDOWS \
+)
+
+ifeq ($(COM),GCC)
+
+$(call gb_LinkTarget_add_cxxflags,$(1),\
+	-Wall \
+	-Wcast-align \
+	-Wconversion \
+	-Wno-long-long \
+	-Woverloaded-virtual \
+	-Wpointer-arith \
+	-Wsynth \
+	-fno-rtti \
+)
+
+else
+
+ifneq ($(DBG_LEVEL),0)
+$(call gb_LinkTarget_add_defs,$(1),\
+	-D_STL_NOFORCE_MANIFEST \
+)
+endif
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(OUTDIR_FOR_BUILD)/lib/embed_base_s.lib \
+	$(OUTDIR_FOR_BUILD)/lib/mozreg_s.lib \
+)
+
+endif
+
+else ifeq ($(GUI),UNX)
+
+$(call gb_LinkTarget_add_defs,$(1),\
+	-DMOZILLA_CLIENT \
+	-DXP_UNIX \
+	$(if $(filter LINUX,$(OS)),-DOJI) \
+	$(if $(filter LINUX MACOSX NETBSD,$(OS)),-DTRACING) \
+)
+
+$(call gb_LinkTarget_add_cflags,$(1),\
+	$(if $(filter LINUX,$(OS)),-g) \
+	$(if $(filter LINUX MACOSX NETBSD,$(OS)),-fPIC) \
+)
+
+$(call gb_LinkTarget_add_cxxflags,$(1),\
+	-Wcast-align \
+	-Wconversion \
+	-Wno-long-long \
+	-Woverloaded-virtual \
+	-Wpointer-arith \
+	-Wsynth \
+	$(if $(filter LINUX,$(OS)),-pthread) \
+	$(if $(filter MACOSX NETBSD,$(OS)),-Wno-deprecated) \
+)
+
+endif
+
+endef
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
+	xpcom \
+	xpcom_core \
+))
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+	embed_base_s \
+	mozreg_s \
+))
+
+endif # SYSTEM_MOZILLA
+
 # MacOSX-only frameworks ############################################
 # (in alphabetical order)

--- a/connectivity/Library_mozab.mk
+++ b/connectivity/Library_mozab.mk
@@ -0,0 +1,55 @@
+# -*- 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@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,mozab2))
+
+$(eval $(call gb_Library_set_componentfile,mozab2,connectivity/source/drivers/mozab/mozab))
+
+$(eval $(call gb_Library_set_include,mozab2,\
+	-I$(SRCDIR)/connectivity/source/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,mozab2,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mozab2,\
+	cppu \
+	cppuhelper \
+	dbtools \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mozab2,\
+	connectivity/source/drivers/mozab/MDriver \
+	connectivity/source/drivers/mozab/MServices \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -0,0 +1,90 @@
+# -*- 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@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,mozabdrv))
+
+$(eval $(call gb_Library_set_include,mozabdrv,\
+	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
+	-I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \
+	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
+	-I$(SRCDIR)/connectivity/source/drivers/mozab \
+	-I$(SRCDIR)/connectivity/source/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,mozabdrv,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mozabdrv,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	dbtools \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,mozabdrv,\
+	mozilla \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mozabdrv,\
+	connectivity/source/drivers/mozab/MCatalog \
+	connectivity/source/drivers/mozab/MColumnAlias \
+	connectivity/source/drivers/mozab/MColumns \
+	connectivity/source/drivers/mozab/MConfigAccess \
+	connectivity/source/drivers/mozab/MConnection \
+	connectivity/source/drivers/mozab/MDatabaseMetaData \
+	connectivity/source/drivers/mozab/MPreparedStatement \
+	connectivity/source/drivers/mozab/MResultSet \
+	connectivity/source/drivers/mozab/MResultSetMetaData \
+	connectivity/source/drivers/mozab/MStatement \
+	connectivity/source/drivers/mozab/MTable \
+	connectivity/source/drivers/mozab/MTables \
+	connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \
+	connectivity/source/drivers/mozab/bootstrap/MNSFolders \
+	connectivity/source/drivers/mozab/bootstrap/MNSINIParser \
+	connectivity/source/drivers/mozab/bootstrap/MNSInit \
+	connectivity/source/drivers/mozab/bootstrap/MNSProfile \
+	connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider \
+	connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover \
+	connectivity/source/drivers/mozab/bootstrap/MNSProfileManager \
+	connectivity/source/drivers/mozab/bootstrap/MNSRunnable \
+	connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper \
+	connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap \
+	connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy \
+	connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener \
+	connectivity/source/drivers/mozab/mozillasrc/MNameMapper \
+	connectivity/source/drivers/mozab/mozillasrc/MQuery \
+	connectivity/source/drivers/mozab/mozillasrc/MQueryHelper \
+	connectivity/source/drivers/mozab/mozillasrc/MTypeConverter \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -0,0 +1,60 @@
+# -*- 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@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,mozbootstrap))
+
+$(eval $(call gb_Library_set_componentfile,mozbootstrap,connectivity/source/drivers/mozab/bootstrap/mozbootstrap))
+
+$(eval $(call gb_Library_add_defs,mozbootstrap,\
+	-DMINIMAL_PROFILEDISCOVER \
+))
+
+$(eval $(call gb_Library_set_include,mozbootstrap,\
+	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,mozbootstrap,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mozbootstrap,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mozbootstrap,\
+	connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \
+	connectivity/source/drivers/mozab/bootstrap/MNSFolders \
+	connectivity/source/drivers/mozab/bootstrap/MNSINIParser \
+	connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover \
+))
+
+# vim: set noet sw=4 ts=4:
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -92,4 +92,15 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif

+ifeq ($(if $(or $(filter-out YES,$(WITH_MOZILLA)),$(filter YES,$(SYSTEM_MOZILLA)),$(filter MACOSX,$(OS))),YES),YES)
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Library_mozbootstrap \
+))
+else
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Library_mozab \
+	Library_mozabdrv \
+))
+endif
+
 # vim: set noet sw=4 ts=4: