diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-24 01:49:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-24 02:00:52 +0300 |
| commit | bbbc51e931c3a7018f2f19f61fa823190ee6fbb1 (patch) | |
| tree | 52d70325b0643baba6f1ea011c139fc4aa7fcc15 /sysui/CustomTarget_infoplist.mk | |
| parent | 2f4d7eacabd62db35777682bcca353e142e024bf (diff) | |
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
Diffstat (limited to 'sysui/CustomTarget_infoplist.mk')
| -rw-r--r-- | sysui/CustomTarget_infoplist.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk index 48e8cc84fefb..f8625c2d1132 100644 --- a/sysui/CustomTarget_infoplist.mk +++ b/sysui/CustomTarget_infoplist.mk @@ -9,6 +9,7 @@ info_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/infoplist) info_SRCDIR := $(SRCDIR)/sysui/desktop/macosx +info_BUILDDIR := $(BUILDDIR)/sysui/desktop/macosx $(eval $(call gb_CustomTarget_CustomTarget,sysui/infoplist)) @@ -24,8 +25,8 @@ $(info_WORKDIR)/PkgInfo: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo "APPLLIBO" > $@ -$(info_WORKDIR)/Info.plist: $(info_SRCDIR)/Info.plist - sed -e "s|\%EXECUTABLE|soffice|g" $< > $@ +$(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) |