Closed Bug 787982 Opened 9 years ago Closed 9 years ago

Add a wrapper at build/pymake/make.py that pulls in mozilla-central if necessary

Categories

(MailNews Core :: Build Config, defect)

defect
Not set
normal

Tracking

(thunderbird17 fixed)

RESOLVED FIXED
Thunderbird 18.0
Tracking Status
thunderbird17 --- fixed

People

(Reporter: rain1, Assigned: rain1)

References

Details

Attachments

(1 file, 2 obsolete files)

Attached patch patch v1 (obsolete) — Splinter Review
I've tested this on a Windows builder and it seems to work fine. I'm going to push this to try next.
Attachment #657885 - Flags: review?(mbanner)
So one problem with this patch is that since mozilla-central loads up the same .mozconfig, $topsrcdir/build/client.py-args isn't found there. Since mozilla-central doesn't actually use that variable, I don't think this is a big problem. An error does show up in the log, though.
Ugh, looks like I'll need to exclude the files from check-sync-dirs.py too.
This should be better.
Attachment #657885 - Attachment is obsolete: true
Attachment #657885 - Flags: review?(mbanner)
Attachment #657894 - Flags: review?(mbanner)
Depends on: 788607
We're going to check this in after enabling pymake on the releng side, so that we have a chance to test Pymake on try.
Attachment #657894 - Attachment is obsolete: true
Attachment #657894 - Flags: review?(mbanner)
Attachment #658556 - Flags: review?(mbanner)
Comment on attachment 658556 [details] [diff] [review]
patch v3, make it dependent on bug 788607

Review of attachment 658556 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/client.py-args
@@ +1,1 @@
> +--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print

I'm not sure this default would work for SeaMonkey when they get to use, as they require pulling the extensions.

However, I think they could still override these args in their mozconfigs, which would then take affect when client.mk calls client.py. Have I got that right?

::: build/pymake/make.py
@@ -1,1 @@
> -#!/usr/bin/env python

Why get rid of this line?
(In reply to Mark Banner (:standard8) from comment #6)
> However, I think they could still override these args in their mozconfigs,
> which would then take affect when client.mk calls client.py. Have I got that
> right?

Hmm. Yes, if what is pulled in through these args is a subset of what is pulled in by SM, then it's safe.

> 
> ::: build/pymake/make.py
> @@ -1,1 @@
> > -#!/usr/bin/env python
> 
> Why get rid of this line?

Yeah no reason to. Reinstated locally.
Comment on attachment 658556 [details] [diff] [review]
patch v3, make it dependent on bug 788607

Ok, lets do this.
Attachment #658556 - Flags: review?(mbanner) → review+
I just pushed this to try server (compensating for the current bustage on trunk) now that pymake has been enabled for the builders:

https://hg.mozilla.org/try-comm-central/rev/e8e5abab63d0
(In reply to Mark Banner (:standard8) from comment #9)
> I just pushed this to try server (compensating for the current bustage on
> trunk) now that pymake has been enabled for the builders:
> 
> https://hg.mozilla.org/try-comm-central/rev/e8e5abab63d0

Err actually, pymake hasn't been enabled :-( I've re-opened bug 786516.
Ok, we have some results, though I don't understand the error:

https://tbpl.mozilla.org/php/getParsedLog.php?id=15821727&tree=Thunderbird-Try
https://tbpl.mozilla.org/php/getParsedLog.php?id=15821676&tree=Thunderbird-Try
https://tbpl.mozilla.org/php/getParsedLog.php?id=15821796&tree=Thunderbird-Try

<msgbase_s.lib.desc>: Found error
<libs>: Found error
e:\builds\moz2_slave\tb-try-c-cen-w32\build\config\rules.mk:998:0$ rm -f msgbsutl_s.lib 
e:\builds\moz2_slave\tb-try-c-cen-w32\build\config\rules.mk:999:0$ c:/mozilla-build/python/python2.6.exe e:/builds/moz2_slave/tb-try-c-cen-w32/build/mozilla/config/pythonpath.py -I../../../mozilla/config e:/builds/moz2_slave/tb-try-c-cen-w32/build/mozilla/config/expandlibs_gen.py --depend .deps/msgbsutl_s.lib.pp -o msgbsutl_s.lib.desc nsMsgLineBuffer.obj nsMsgDBFolder.obj nsMsgKeyArray.obj nsMsgKeySet.obj nsMsgIdentity.obj nsMsgIncomingServer.obj nsMsgUtils.obj nsMsgProtocol.obj nsMsgMailNewsUrl.obj nsMsgTxn.obj nsMsgI18N.obj nsImapMoveCoalescer.obj nsMsgFileStream.obj nsMsgCompressIStream.obj nsMsgCompressOStream.obj nsMsgReadStateTxn.obj nsStopwatch.obj  
e:\builds\moz2_slave\tb-try-c-cen-w32\build\config\rules.mk:745:0: command 'C:/mozilla-build/buildbotve/scripts/python.exe e:/builds/moz2_slave/tb-try-c-cen-w32/build/mozilla/build/pymake/pymake/../make.py -C src libs' failed, return code 2
<libs>: Found error
Checked in:

https://hg.mozilla.org/comm-central/rev/5a49ea8a7052
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 18.0
Comment on attachment 658556 [details] [diff] [review]
patch v3, make it dependent on bug 788607

[Triage Comment]
We want this on 17 for pymake goodness.
Attachment #658556 - Flags: approval-comm-aurora+
Comment on attachment 658556 [details] [diff] [review]
patch v3, make it dependent on bug 788607

Review of attachment 658556 [details] [diff] [review]:
-----------------------------------------------------------------

::: build/client.py-args
@@ +1,1 @@
> +--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print

This patch is making us pull the wrong things for releases because we don't have --comm-rev or --mozilla-rev passed to client.py anymore.
Blocks: 796975, 796966
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Turns out I'm wrong - I got totally confused when reading the revision history. This bug doesn't affect the --comm-rev and --mozilla-rev flags at all. We got rid of those in bug 763769 in favour of having client.py look directly at the environment variables instead. There is no problem here after all, yay!
Status: REOPENED → RESOLVED
Closed: 9 years ago9 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.