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 /solenv/bin/modules/installer/ziplist.pm | |
| 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 'solenv/bin/modules/installer/ziplist.pm')
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 389b79deb52e..dc24d4b025a0 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -791,8 +791,6 @@ sub replace_variables_in_ziplist_variables my $localminor = $installer::globals::lastminor; if ( $installer::globals::minor ) { $localminor = $installer::globals::minor; } - my $buildidstringcws = $installer::globals::build . $localminor . "(Build:" . $installer::globals::buildid . ")"; - for ( my $i = 0; $i <= $#{$blockref}; $i++ ) { if ($installer::globals::lastminor) { ${$blockref}[$i] =~ s/\{milestone\}/$milestonevariable/; } @@ -803,7 +801,6 @@ sub replace_variables_in_ziplist_variables else { ${$blockref}[$i] =~ s/\{buildid\}//; } if ( $installer::globals::build ) { ${$blockref}[$i] =~ s/\{buildsource\}/$installer::globals::build/; } else { ${$blockref}[$i] =~ s/\{build\}//; } - ${$blockref}[$i] =~ s/\{buildidcws\}/$buildidstringcws/; } } |