solenv/gbuild/Package.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 77074e462ca2e083fa30f826b54869eee9b04d79
Author: David Tardon <dtar...@redhat.com>
Date: Tue Apr 16 17:02:10 2013 +0200
gbuild: make sure filelists don't contain duplicates
Change-Id: Ie8e65b945d0d89b7ff95f2aedcded1463939c5d6
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index e2306fe..493748d 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -75,10 +75,16 @@ $(call gb_Package_get_clean_target,%) :
$(call gb_Package_get_preparation_target,%) :
mkdir -p $(dir $@) && touch $@
+# NOTE: It is possible that a file has been added to the package more
+# than once, so we must drop the duplicates, or Windows installer will
+# be unhappy.
+# TODO: this is only for convenience for impl. of gbuild classes. There
+# should be check that it does not happen in "normal" use, i.e., in
+# Package_foo makefiles.
$(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
rm -f $@ && \
- mv $(call var2file,$@.tmp,100,$(FILES)) $@
+ mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
# for other targets that want to create Packages, does not register at Module
define gb_Package_Package_internal
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
