fdo#70393: move moz to a subdir of external

Change-Id: I9e9b47a3b8fc298b0a371ef609f342a8366b0039
Reviewed-on: https://gerrit.libreoffice.org/6345
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

8 files changed, 157 insertions, 0 deletions

diff --git a/external/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk
new file mode 100644
index 000000000000..6246b212cdc6
--- /dev/null
+++ b/external/moz/ExternalPackage_moz_lib.mk
@@ -0,0 +1,19 @@
+# -*- 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_lib,moz_lib))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\
+	nslber32v50.lib \
+	nsldap32v50.lib \
+	xpcom.lib \
+	xpcom_core.lib \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk
new file mode 100644
index 000000000000..ca1cb11ef08b
--- /dev/null
+++ b/external/moz/ExternalPackage_runtime.mk
@@ -0,0 +1,57 @@
+# -*- 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_set_outdir,moz_runtime,$(INSTROOT)))
+
+$(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
new file mode 100644
index 000000000000..e4968cf85fb6
--- /dev/null
+++ b/external/moz/Makefile
@@ -0,0 +1,7 @@
+# -*- 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
new file mode 100644
index 000000000000..d2cad1723230
--- /dev/null
+++ b/external/moz/Module_moz.mk
@@ -0,0 +1,24 @@
+# -*- 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))
+
+ifeq ($(WITH_MOZAB4WIN),YES)
+
+$(eval $(call gb_Module_add_targets,moz,\
+	ExternalPackage_moz_lib \
+	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
new file mode 100644
index 000000000000..50a639abab63
--- /dev/null
+++ b/external/moz/README
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 000000000000..94a1615e2b9b
--- /dev/null
+++ b/external/moz/UnpackedTarball_moz_inc.mk
@@ -0,0 +1,15 @@
+# -*- 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
new file mode 100644
index 000000000000..8a324ad9fc25
--- /dev/null
+++ b/external/moz/UnpackedTarball_moz_lib.mk
@@ -0,0 +1,15 @@
+# -*- 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
new file mode 100644
index 000000000000..ac181db7628e
--- /dev/null
+++ b/external/moz/UnpackedTarball_mozruntime.mk
@@ -0,0 +1,14 @@
+# -*- 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: