Closed Bug 414530 Opened 13 years ago Closed 13 years ago

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

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(Not tracked)

RESOLVED FIXED
mozilla1.9beta4

People

(Reporter: mayhemer, Assigned: mayhemer)

Details

Attachments

(1 file, 2 obsolete files)

Attached patch Possible fix (obsolete) — Splinter Review
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.
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.
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.
See bug 383099 for how you actually want to fix it.
Attached patch Fix v1 (obsolete) — Splinter Review
I didn't test this patch on other platforms but on windows it works.
Assignee: nobody → honzab
Attachment #299980 - Attachment is obsolete: true
Status: NEW → ASSIGNED
Attachment #300403 - Flags: review?(ted.mielczarek)
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.
Attachment #300403 - Attachment is obsolete: true
Attachment #300403 - Flags: review?(ted.mielczarek)
Attached patch Fix, v2Splinter Review
Fixed and tested also on Mac OS X. Works perfectly.
Attachment #300635 - Flags: review?(philringnalda)
Attachment #300635 - Flags: review?(philringnalda) → review?(ted.mielczarek)
Attachment #300635 - Flags: review?(ted.mielczarek) → review+
Keywords: checkin-needed
Keywords: checkin-needed
Attachment #300635 - Flags: approval1.9?
Attachment #300635 - Flags: approval1.9? → approval1.9+
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
Status: ASSIGNED → RESOLVED
Closed: 13 years ago
Keywords: checkin-needed
Resolution: --- → FIXED
Target Milestone: --- → mozilla1.9beta4
OS: Windows XP → All
Hardware: PC → All
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.