From bbbc51e931c3a7018f2f19f61fa823190ee6fbb1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 24 Sep 2013 01:49:59 +0300 Subject: Create a proper Info.plist for the OS X app bundle already in configure After recent instdir changes the SCPZIP_REPLACE thing was not used any more for Info.plist, so all the ${FOO} things were left in Info.plist unexpanded with predictably wonky results, a non-working app. Instead just expand it from the configure script. While at it, use a correct CFBundleShortVersionString: only three integers should be in that. Also, hardcode FILEFORMATNAME as OpenOffice.org and FILEFORMATVERSION as 1.0, and drop the "variables", as that is what those "variables" *means*. They were used to refer to the OOo 1.0 formats. (It would have been utterly wrong to define them as something else, like another product name and a newer version number, in openoffice.lst, so pointless to have them there.) Drop the meaningless BUILDIDCWS. Change-Id: I4030aa060b78e8b3fb812a6362869996e8db7d3d --- postprocess/CustomTarget_registry.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index ba5479617693..b353f7a928eb 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -550,8 +550,6 @@ postprocess_main_SED := \ -e 's,$${ABOUTBOXPRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ -e 's,$${ABOUTBOXPRODUCTVERSIONSUFFIX},$(LIBO_VERSION_SUFFIX_SUFFIX),g' \ -e 's,$${DICT_REPO_URL},http://extensions.libreoffice.org/dictionaries/,g' \ - -e 's,$${FILEFORMATNAME},OpenOffice.org,g' \ - -e 's,$${FILEFORMATVERSION},1.0,g' \ -e 's,$${OOOVENDOR},$(if $(OOO_VENDOR),$(OOO_VENDOR),The Document Foundation),g' \ -e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \ -e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \ -- cgit