383099 - error in Makefile creation caused by autoconf syntax

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Wolfgang Rosenauer [:wolfiR]]

During makefile creation the following error appears:

Unknown variable:toolkit/airbag/client/Makefile:98:	sed -e "s/@APP_NAME@/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | 

That's because the replacement algorithm searches for @STRING@ in makefiles to replace. The string should be bounded with a different character.
Simple patch upcoming.

Comment 1

[Wolfgang Rosenauer [:wolfiR]]

Attachment: patch

Comment 2

[(not currently active) Ted Mielczarek]

It looks like Dave was just following the example set elsewhere in the tree:
http://mxr.mozilla.org/mozilla/source/browser/app/Makefile.in#373

Does this same error show up in those Makefiles as well?

Comment 3

[Wolfgang Rosenauer [:wolfiR]]

Yes:

Unknown variable:browser/app/Makefile:328:	sed -e "s/@APP_VERSION@/$(APP_VERSION)/" -e "s/@APP_NAME@/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist

I've noticed the issue in a xulrunner build and so I haven't noticed this.

Comment 4

[Wolfgang Rosenauer [:wolfiR]]

This is not a severe error. I mean everything is working well besides of the error message but it should still be fixed ;-)

Comment 5

[(not currently active) Ted Mielczarek]

Comment on attachment 267113 [details] [diff] [review]
patch

Ok, r=me if you promise to at least file a followup to fix the rest of the tree.

Comment 6

[Wolfgang Rosenauer [:wolfiR]]

Moving where more appropriate since to address the same issues over the tree

Comment 7

[Wolfgang Rosenauer [:wolfiR]]

one more:

Unknown variable:mail/app/Makefile:298:	sed -e "s/@APP_VERSION@/$(APP_VERSION)/" -e "s/@APP_NAME@/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist

Comment 8

[Wolfgang Rosenauer [:wolfiR]]

Attachment: patch #2

Patch that should fix the rest. (At least all I found)

Comment 9

[(not currently active) Ted Mielczarek]

Comment on attachment 267139 [details] [diff] [review]
patch #2

We're inconsistent about how we handle this in the tree, suite/app/Makefile.in does this particular thing using escaped @, but these same Makefiles use % to do some sed replacement in a shell script.  I think the % is probably better, since that way we're not fooling anyone into thinking we're doing autoconf substitution.

Comment 10

[Wolfgang Rosenauer [:wolfiR]]

Second patch checked in.