[Libreoffice-commits] core.git: 2 commits - Makefile.in Repository.mk

[Tor Lillqvist]

 Makefile.in   |   12 +++++++++---
 Repository.mk |    4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit ebdb1b85b7ab75e36ca5efc2580497f779a9ee04
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 19 12:47:02 2014 +0300

    Unzip the InfoPlist.strings files into correct locations
    
    Not sure how useful it is to only provide translations for the ODF
    document format names, though.
    
    Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c
    (cherry picked from commit 16f62d80c38f3920a40fc078edecad905ba2b196)
    (cherry picked from commit 348ac6a9d28d5961b8804a7be09d334fbc8ef21a)

diff --git a/Makefile.in b/Makefile.in
index 686f647..a5461ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -306,9 +306,15 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
 	@$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-# The InfoPlist_*.zip files in "bin" are totally pointless and should
-# not be there. I am too lazy at the moment to figure out how to
-# prevent them from ending up there.
+# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories.
+	set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \
+		bn=`basename $$F .zip`; \
+		lang=$${bn#InfoPlist_}; \
+		lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \
+		mkdir $$lproj; \
+		(cd $$lproj; unzip $$F); \
+	done
+# And remove the "bin" folder which should not be there
 	rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin
 	@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app
 endif
commit 7af143a69ff183c7cc22e498833377b99704cf42
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun May 17 14:32:02 2015 +0200

    Don't package ui-previewer in App Store case
    
    Change-Id: I122c65d7f6dec7588ea2624e291e9dfe04dff22c
    (cherry picked from commit 89dff9226690829b985371c3f2b29e57bfed06ed)

diff --git a/Repository.mk b/Repository.mk
index 36416ce..df446f6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -147,7 +147,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,writer_brand, \
 $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 	$(if $(filter WNT,$(OS)),,uri-encode) \
-	ui-previewer \
+	$(if $(ENABLE_MACOSX_SANDBOX),, \
+		ui-previewer \
+	) \
 	$(if $(filter WNT,$(OS)), \
 		senddoc \
 	) \