tdf#122244 Put InfoPlist.strings files at correct places on macOS

Don't know how this got broken, presumably somewhere along the line from
01344a8c "convert sysui to gbuild and add to
tail_build" through 4430ace3 "tdf#90753:
AutoInstall more packages" to the current state, where a spurious bin directory
containing InfoPlist_*.zip files containing (empty) InfoPlist.strings files is
placed in instdir/ and in the root window of .dmg files.

As discussed in the <https://developer.apple.com/library/archive/documentation/
General/Reference/InfoPlistKeyReference/Articles/
AboutInformationPropertyListFiles.html> "Localizing Property List Values"
section, those InfoPlist.strings files shall apparently be placed into the
Contents/Resources/*.lproj/ directories.  (And the zip wrappers were presumably
needed in the past to transport their payload to the proper places in the
installation set, and are now obsolete.)

The list of Apple language IDs for the *.lproj directories was already
duplicated in Makefile.in (test-install target) and
solenv/bin/modules/installer/simplepackage.pm (sub create_package).  Ultimately
those lists should all be consolidated.  Also, mapping from our language IDs
(see solenv/inc/langlist.mk) to the Apple *.lproj ones needs some fixing (e.g.,
from zh-CN to zh_CN), and it is not clear to me why the old code explicilty
added en-US to the gb_WITH_LANG list of languages for which to generate
InfoPlist_*.zip and InfoPlist.strings files (when that would presumably be the
non-localized strings stored in Info.plist itself).  But as mentiond, those
InfoPlist.strings files are all empty anyway (which may be due to another bug?),
so it shouldn't matter much---at least for now---what
Contents/Resources/*.lproj/InfoPlist.strings files exactly are present in an
installation set.

Change-Id: Iaadce2375ed319928891bace44f9866622ec3084
Reviewed-on: https://gerrit.libreoffice.org/71277
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

sysui/CustomTarget_infoplist.mk

@@ -17,8 +17,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,sysui/infoplist))
 $(eval $(call gb_CustomTarget_register_targets,sysui/infoplist,\
 	PkgInfo \
 	Info.plist \
-	$(foreach lang,en-US $(gb_WITH_LANG),\
-	InfoPlist_$(lang).zip InfoPlist_$(lang)/InfoPlist.strings) \
+	$(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+	InfoPlist_$(lang)/InfoPlist.strings) \
 ))
 
 $(info_WORKDIR)/PkgInfo:
@@ -28,10 +28,6 @@ $(info_WORKDIR)/PkgInfo:
 $(info_WORKDIR)/Info.plist: $(info_BUILDDIR)/Info.plist
 	cp $< $@
 
-$(info_WORKDIR)/InfoPlist_%.zip: $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
-	zip -j $@ $<
-
 $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: \
 		$(info_WORKDIR)/Info.plist $(info_WORKDIR)/documents.ulf
 	mkdir -p $(dir $@)

sysui/Package_infoplist.mk

@@ -17,8 +17,9 @@ $(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/C
 	Info.plist \
 ))
 
-$(eval $(call gb_Package_add_files,infoplist,bin,\
-	$(foreach lang,en-US $(gb_WITH_LANG),InfoPlist_$(lang).zip) \
-))
+$(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+$(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/$(lang).lproj,\
+	InfoPlist_$(lang)/InfoPlist.strings \
+)))
 
 # vim: set noet sw=4 ts=4: