From ebdb1b85b7ab75e36ca5efc2580497f779a9ee04 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Sep 2014 12:47:02 +0300 Subject: [PATCH] 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) --- Makefile.in | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 686f64769cd5..a5461ca42d56 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