summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-10-23 18:39:07 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-25 15:02:44 +0000
commit4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f (patch)
treed90b50de0479ab3f8e60e36a85ce448f36934d87 /external
parentbe114fd49371beb8877c1cf34b48319967458c8a (diff)
Remove Seamonkey based address book driver
Seamonkey based address book driver is based on pre-compiled libraries and is only used on Windows 32 bit. Remove it in favor of mork driver. Given that Seamonkey based mozab driver also provides Outlook and Outlook Express address book integration, that Windows-32-bit--only feature is lost for now. If necessary, support for that feature could be rewritten from scratch, in a way that would also work for Windows 64 bit. Change-Id: Ie1c125e692598bda999767c328c9e2262a2b82af Reviewed-on: https://gerrit.libreoffice.org/19560 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/moz/ExternalPackage_runtime.mk55
-rw-r--r--external/moz/Makefile7
-rw-r--r--external/moz/Module_moz.mk23
-rw-r--r--external/moz/README6
-rw-r--r--external/moz/UnpackedTarball_moz_inc.mk15
-rw-r--r--external/moz/UnpackedTarball_moz_lib.mk15
-rw-r--r--external/moz/UnpackedTarball_mozruntime.mk14
-rw-r--r--external/msc-externals/Module_msc-externals.mk1
9 files changed, 0 insertions, 137 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk
index aadb722d469e..9daf548c4ec2 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MDDS,mdds) \
$(if $(WITH_EXTRA_EXTENSIONS),misc_extensions) \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
- $(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/external/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk
deleted file mode 100644
index d141f83ece47..000000000000
--- a/external/moz/ExternalPackage_runtime.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(LIBO_BIN_FOLDER),\
- components/addrbook.dll \
- components/addrbook.xpt \
- components/i18n.dll \
- components/mork.dll \
- components/mozldap.dll \
- components/mozldap.xpt \
- components/necko.dll \
- components/necko_dns.xpt \
- components/pipnss.dll \
- components/pref.xpt \
- components/profile.dll \
- components/rdf.dll \
- components/uconv.dll \
- components/vcard.dll \
- components/xpc3250.dll \
- components/xpcom_base.xpt \
- components/xpcom_compat_c.dll \
- components/xpcom_components.xpt \
- components/xpcom_ds.xpt \
- components/xpcom_io.xpt \
- components/xpcom_obsolete.xpt \
- components/xpcom_thread.xpt \
- components/xpcom_xpti.xpt \
- components/xppref32.dll \
- defaults/autoconfig/platform.js \
- defaults/autoconfig/prefcalls.js \
- defaults/pref/browser-prefs.js \
- defaults/pref/mailnews.js \
- defaults/pref/mdn.js \
- defaults/pref/smime.js \
- greprefs/all.js \
- greprefs/security-prefs.js \
- js3250.dll \
- mozz.dll \
- msgbsutl.dll \
- nsldap32v50.dll \
- nsldappr32v50.dll \
- xpcom.dll \
- xpcom_compat.dll \
- xpcom_core.dll \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/moz/Makefile b/external/moz/Makefile
deleted file mode 100644
index e4968cf85fb6..000000000000
--- a/external/moz/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/moz/Module_moz.mk b/external/moz/Module_moz.mk
deleted file mode 100644
index 3f4b6ef8de2d..000000000000
--- a/external/moz/Module_moz.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,moz))
-
-ifneq ($(WITH_MOZAB4WIN),)
-
-$(eval $(call gb_Module_add_targets,moz,\
- ExternalPackage_runtime \
- UnpackedTarball_moz_inc \
- UnpackedTarball_moz_lib \
- UnpackedTarball_mozruntime \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/moz/README b/external/moz/README
deleted file mode 100644
index 50a639abab63..000000000000
--- a/external/moz/README
+++ /dev/null
@@ -1,6 +0,0 @@
-Used only for building Windows Address book connectivity.
-
-Rebuild moz whenever changes have been made in the nss module. Those libs are
-merged into mozruntime.zip which is built in this project.
-
-Please read, please read about [[nss]].
diff --git a/external/moz/UnpackedTarball_moz_inc.mk b/external/moz/UnpackedTarball_moz_inc.mk
deleted file mode 100644
index 94a1615e2b9b..000000000000
--- a/external/moz/UnpackedTarball_moz_inc.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,moz_inc))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,moz_inc,$(MOZ_ZIP_INC),0))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/moz/UnpackedTarball_moz_lib.mk b/external/moz/UnpackedTarball_moz_lib.mk
deleted file mode 100644
index 8a324ad9fc25..000000000000
--- a/external/moz/UnpackedTarball_moz_lib.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,moz_lib))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,moz_lib,$(MOZ_ZIP_LIB),0))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/moz/UnpackedTarball_mozruntime.mk b/external/moz/UnpackedTarball_mozruntime.mk
deleted file mode 100644
index ac181db7628e..000000000000
--- a/external/moz/UnpackedTarball_mozruntime.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,mozruntime))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,mozruntime,$(MOZ_ZIP_RUNTIME),0))
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk
index 58a21953f094..002dcf5cc0b9 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,msc-externals))
$(eval $(call gb_Module_add_targets,msc-externals,\
$(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
Package_msvc_dlls \
- $(if $(WITH_MOZAB4WIN),Package_msvc80_dlls) \
))
# vim: set noet sw=4 ts=4: