Closed
Bug 695812
Opened 13 years ago
Closed 13 years ago
client.mk with RUN_CLIENT_PY doesn't work with mozconfigs that include from mozilla/
Categories
(MailNews Core :: Build Config, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
Thunderbird 10.0
People
(Reporter: gozer, Assigned: gozer)
Details
Attachments
(1 file, 2 obsolete files)
787 bytes,
patch
|
standard8
:
review+
Callek
:
review+
|
Details | Diff | Splinter Review |
i.e. our mac universal builds mozconfig sources: . mozilla/build/macosx/universal/mozconfig Which happens very early in client.mk, before we had the time to invoke client.py to clone anything. So, builds break as a result. The solution I found is similar to how MOZ_BUILD_PROJECTS is implemented. When detecting it must run client.py, client.mk does that and then just re-invokes client.mk, now able to pull in the stuff from mozilla/
Attachment #568159 -
Flags: review?(mbanner)
Comment 1•13 years ago
|
||
Comment on attachment 568159 [details] [diff] [review] client.mk re-invokes itself after running client.py If I run without ALWAYS_RUN_CLIENT_PY & co set, then with this patch applied I get: set -e; \ for mkfile in build/macosx/universal/flight.mk; do \ make -f /Users/moztest/comm/main/src/$mkfile postflight_all TOPSRCDIR=/Users/moztest/comm/main/src MOZ_OBJDIR=/Users/moztest/comm/main/src/../tbuniv MOZ_BUILD_PROJECTS="i386 x86_64"; \ done /Users/moztest/comm/main/src/build/macosx/universal/flight.mk:50: /Users/moztest/comm/main/src/../tbuniv/i386/config/autoconf.mk: No such file or directory make[1]: *** No rule to make target `/Users/moztest/comm/main/src/../tbuniv/i386/config/autoconf.mk'. Stop. make: *** [build] Error 2
Attachment #568159 -
Flags: review?(mbanner) → review-
Assignee | ||
Comment 2•13 years ago
|
||
Can you try this one instead, I didn't consider the case without ALWAYS_RUN_CLIENT_PY
Attachment #568499 -
Flags: review?(mbanner)
Comment 3•13 years ago
|
||
Comment on attachment 568499 [details] [diff] [review] client.mk re-invokes itself after running client.py v2 Overall I can't think of a better solution to this. My gut feeling though, is that we don't need RAN_CLIENT_PY here since we do ifeq(0,$MAKELEVEL) I have not tested it though. Idealy *our* mozconfigs won't require anything in m-c though, but I won't ask you to refactor those for this.
Attachment #568499 -
Flags: feedback+
Comment 4•13 years ago
|
||
(In reply to Justin Wood (:Callek) from comment #3) > Idealy *our* mozconfigs won't require anything in m-c though, but I won't > ask you to refactor those for this. That would require duplicating the mac universal mozconfigs: http://mxr.mozilla.org/comm-central/source/mozilla/build/macosx/universal/ Which I don't think is really worth doing.
Updated•13 years ago
|
Attachment #568499 -
Flags: review?(mbanner) → review+
Updated•13 years ago
|
Assignee: nobody → gozer
Target Milestone: --- → Thunderbird 10.0
Assignee | ||
Comment 5•13 years ago
|
||
(In reply to Justin Wood (:Callek) from comment #3) > Comment on attachment 568499 [details] [diff] [review] [diff] [details] [review] > client.mk re-invokes itself after running client.py v2 > > Overall I can't think of a better solution to this. It's somewhat ugly, but I couldn't think of another way either. > My gut feeling though, is that we don't need RAN_CLIENT_PY here since we do > ifeq(0,$MAKELEVEL) I have not tested it though. I thought it was unavoidable, but now that you mention it, I think it can be done. > Idealy *our* mozconfigs won't require anything in m-c though, but I won't > ask you to refactor those for this. Yeah, that was a big surprise for me, I didn't think about that at all. P.S. I've got a v3 patch in the works that gets away with RUN_CLIENT_PY
Assignee | ||
Comment 6•13 years ago
|
||
And as pointed out, there was a simpler solution
Attachment #568159 -
Attachment is obsolete: true
Attachment #568499 -
Attachment is obsolete: true
Attachment #568725 -
Flags: review?(mbanner)
Attachment #568725 -
Flags: review?(bugspam.Callek)
Updated•13 years ago
|
Attachment #568725 -
Flags: review?(mbanner) → review+
Comment 7•13 years ago
|
||
Comment on attachment 568725 [details] [diff] [review] client.mk re-invokes itself after running client.py v3 >diff --git a/client.mk b/client.mk > endif # MOZ_CURRENT_PROJECT >+endif # RAN_CLIENT_PY Nit: comment change to ALWAYS_RUN_CLIENT_PY or else drop it (comment) entirely
Attachment #568725 -
Flags: review?(bugspam.Callek) → review+
Updated•13 years ago
|
Product: Thunderbird → MailNews Core
QA Contact: build-config → build-config
Comment 8•13 years ago
|
||
Checked in: http://hg.mozilla.org/comm-central/rev/c005213082eb
Status: NEW → RESOLVED
Closed: 13 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
You need to log in
before you can comment on or make changes to this bug.
Description
•