345338 - Set app name in InfoPlist.strings during build

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Robert Kaiser]

We should probably do the same as FF/TB did in bug 343931 for SeaMonkey's files in suite/app/macbuild, esp. for InfoPlist.strings (even if we're normally using the same brand name everywhere, that solution is cleaner than just hardcoding.

Comment 1

[Stefan [:stefanh]]

Attachment: Set appname etc during build and make a utf-16 InfoPlist.strings

This is basically the same patch as the one in bug 343931. Well, I had to escape the "@":s and we use a MOZ prefix. I also removed the period at the copyright line and changed "Mozilla.org" to "mozilla.org" (it looks like we where the only ones using capital "M"). Note that the InfoPlist.strings in suite/app/macbuild/Contents/Resources/English.lproj/ should be cvs removed.

I don't know who should review this - KaiRo?

Comment 2

[Stefan [:stefanh]]

Attachment: Correct version

Bah, forgot one copyright line. This one should be ok.

Comment 3

[Stefan [:stefanh]]

Comment on attachment 234276 [details] [diff] [review]
Correct version

Mark, could you take a quick look at this? You should recognize the code... :-)

This is for the forthcoming suiterunner, so  we don't use it in our regular trunk builds (ie, not part of any "official" build).

Comment 4

[Mark Mentovai]

Comment on attachment 234276 [details] [diff] [review]
Correct version

>+++ suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in	Wed Aug 16

>+NSHumanReadableCopyright = "Copyright © 1998-2006 Contributors to mozilla.org";

Don't we usually just use "Contributors" these days?

>Index: suite/app/Makefile.in

>+	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist

What's with the backslashes?

Comment 5

[Robert Kaiser]

> What's with the backslashes?

That's tricky ;-)
We need them so that the .in preprocessing step doesn't already replace @MOZ_APP_NAME@ et al. with the vars themselves. We apparently use them for the same reason in other Makefile.ins as well.

Comment 6

[Stefan [:stefanh]]

(In reply to comment #4)
> (From update of attachment 234276 [details] [diff] [review] [edit])
> >+++ suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in	Wed Aug 16
> 
> >+NSHumanReadableCopyright = "Copyright © 1998-2006 Contributors to mozilla.org";
> 
> Don't we usually just use "Contributors" these days?

Even though I prefer to just use "Contributors" it looks like Gerv wants "Contributors to mozilla.org", see https://bugzilla.mozilla.org/show_bug.cgi?id=299581#c14. Don't ask me why.
 
> >Index: suite/app/Makefile.in
> 
> >+	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
> 
> What's with the backslashes?
> 

See comment #5. As KaiRo points out, not escaping the "@" makes the preprocessing replace @MOZ_APP_NAME@ with the value of MOZ_APP_NAME. So, sed never do any substitution and you end up with a InfoPlist.strings file with @MOZ_APP_NAME@ etc. It almost made me insane..

Comment 7

[Mark Mentovai]

Comment on attachment 234276 [details] [diff] [review]
Correct version

OK, looks good, then.

Comment 8

[Stefan [:stefanh]]

Checked in by Mark Banner (thanks).

Comment 9

[Karsten Düsterloh]

> > What's with the backslashes?
> 
> See comment #5. As KaiRo points out, not escaping the "@" makes the
> preprocessing replace @MOZ_APP_NAME@ with the value of MOZ_APP_NAME. So, sed
> never do any substitution and you end up with a InfoPlist.strings file with
> @MOZ_APP_NAME@ etc. It almost made me insane..

That should be worth a comment in the respective file...