414530 - toolkit/mozapps/update/src/updater/Makefile broken

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Honza Bambas (:mayhemer)]

Attachment: Possible fix

Whenever I do complete trunk checkout and build it this makefile is broken (incompletely generated). The problem seems to be @APP_NAME@ variable in the makefile.in on which the preprocessor fails.

The attachment enclosed is my own (probably incorrect) fix for the problem. I don't see @APP_NAME@ in any other Makefile.in file in the tree.

Maybe this is problem of environment build config. However, I am not the only one having this problem. This probably happens just on windows platform.

Comment 1

[Matthew Gertner]

What is the error you get when building? The makefile code you modified is specific to the Mac so I'm curious to know why it is producing an error on Windows.

Comment 2

[Honza Bambas (:mayhemer)]

The generated Makefile in the obj dir is not complete. The rest of the file from the line I modify in the patch inclusive is missing. 

Even the code is related to the mac platform the preprocessor which replaces @???@ variables doesn't care about it.

Comment 3

[Phil Ringnalda (:philor)]

See bug 383099 for how you actually want to fix it.

Comment 4

[Honza Bambas (:mayhemer)]

Attachment: Fix v1

I didn't test this patch on other platforms but on windows it works.

Comment 5

[Phil Ringnalda (:philor)]

Comment on attachment 300403 [details] [diff] [review]
Fix v1

That's only because on Windows it doesn't have any (visible) effect :)

You only got half the fix, you also have to change the string in toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in to be %APP_NAME% - sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/... is telling sed to replace the string "%APP_NAME%" in InfoPlist.strings.in with the value of MOZ_APP_DISPLAYNAME, so you need to have that actual string in the file for it to find.

Comment 6

[Honza Bambas (:mayhemer)]

Attachment: Fix, v2

Fixed and tested also on Mac OS X. Works perfectly.

Comment 7

[Reed Loden [:reed]]

Checking in toolkit/mozapps/update/src/updater/Makefile.in;
/cvsroot/mozilla/toolkit/mozapps/update/src/updater/Makefile.in,v  <--  Makefile.in
new revision: 1.22; previous revision: 1.21
done
Checking in toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in;
/cvsroot/mozilla/toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in,v  <--  InfoPlist.strings.in
new revision: 1.4; previous revision: 1.3
done