moz/CustomTarget_runtime.mk | 27 ------------------
moz/ExternalPackage_runtime.mk | 57 ++++++++++++++++++++++++++++++++++++++
moz/Module_moz.mk | 2 -
moz/Package_runtime.mk | 14 ---------
moz/UnpackedTarball_mozruntime.mk | 14 +++++++++
scp2/source/ooo/file_ooo.scp | 6 ++--
6 files changed, 75 insertions(+), 45 deletions(-)
New commits:
commit ea9ba874c3a0d85eb9430dc7913928086fff34c3
Author: David Tardon <dtar...@redhat.com>
Date: Sat May 4 15:14:22 2013 +0200
install moz. runtime files using filelist
Change-Id: Iddc1a86d34a6d05f2a2939fb72f057fb387bbe1f
Reviewed-on: https://gerrit.libreoffice.org/3781
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/moz/CustomTarget_runtime.mk b/moz/CustomTarget_runtime.mk
deleted file mode 100644
index 1296f2a..0000000
--- a/moz/CustomTarget_runtime.mk
+++ /dev/null
@@ -1,27 +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/.
-#
-
-MOZ_DEL_LIST := freebl3.dll \
- nspr4.dll \
- nss3.dll \
- plc4.dll \
- plds4.dll \
- smime3.dll \
- softokn3.dll \
- ssl3.dll
-
-$(eval $(call gb_CustomTarget_CustomTarget,moz/runtime))
-
-$(eval $(call gb_CustomTarget_register_target,moz/runtime,mozruntime.zip))
-
-$(call gb_CustomTarget_get_workdir,moz/runtime)/mozruntime.zip:
$(TARFILE_LOCATION)/$(MOZ_ZIP_RUNTIME)
- cp $< $@
- zip -qd $@ $(MOZ_DEL_LIST)
-
-# vim: set noet sw=4 ts=4:
diff --git a/moz/ExternalPackage_runtime.mk b/moz/ExternalPackage_runtime.mk
new file mode 100644
index 0000000..e43519e
--- /dev/null
+++ b/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,$(INSTDIR)))
+
+$(eval $(call
gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,program,\
+ 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/moz/Module_moz.mk b/moz/Module_moz.mk
index f447668..3be2c18 100644
--- a/moz/Module_moz.mk
+++ b/moz/Module_moz.mk
@@ -13,7 +13,7 @@ ifeq ($(WITH_MOZAB4WIN),YES)
$(eval $(call gb_Module_add_targets,moz,\
ExternalPackage_moz_lib \
- CustomTarget_runtime \
+ ExternalPackage_runtime \
Package_runtime \
UnpackedTarball_moz_inc \
UnpackedTarball_moz_lib \
diff --git a/moz/Package_runtime.mk b/moz/UnpackedTarball_mozruntime.mk
similarity index 66%
rename from moz/Package_runtime.mk
rename to moz/UnpackedTarball_mozruntime.mk
index 59fb894..228890c 100644
--- a/moz/Package_runtime.mk
+++ b/moz/UnpackedTarball_mozruntime.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,moz/runtime,$(call
gb_CustomTarget_get_workdir,moz/runtime)))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,mozruntime))
-$(eval $(call
gb_Package_add_file,moz/runtime,bin/mozruntime.zip,mozruntime.zip))
+$(eval $(call gb_UnpackedTarball_set_tarball,mozruntime,$(MOZ_ZIP_RUNTIME)))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index fb2b35e..6bca90f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -595,9 +595,9 @@ End
File gid_File_Mozilla_Runtime
TXT_FILE_BODY;
- Styles = (ARCHIVE);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "mozruntime.zip";
+ Styles = (FILELIST);
+ Dir = FILELIST_DIR;
+ Name = "moz_runtime.filelist";
End
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
