Closed Bug 902316 Opened 6 years ago Closed 6 years ago

build more external projects in parallel

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla26

People

(Reporter: tbsaunde, Assigned: tbsaunde)

References

(Blocks 1 open bug)

Details

(Whiteboard: looks like libmar can be built such that it depends on nss :()

Attachments

(3 files)

makes things a bit faster (a minut to a minute and a half on my machine for pretty little effort so I think its worth doing until we have something better.
Comment on attachment 787305 [details] [diff] [review]
bug 902316 - add an external tier that builds a number of external projects in parallel

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

::: config/external/moz.build
@@ +6,5 @@
> +if not CONFIG['MOZ_NATIVE_JPEG']:
> +    external_dirs += ['media/libjpeg']
> +
> +if CONFIG['MOZ_UPDATER']:
> +    if not CONFIG['MOZ_NATIVE_BZ2']:

if CONFIG['MOZ_UPDATER'] and not CONFIG['MOZ_NATIVE_BZ2']:

@@ +63,5 @@
> +
> +if CONFIG['MOZ_UPDATER']:
> +    external_dirs += ['modules/libmar']
> +
> +    PARALLEL_DIRS += ['../../' + i for i in external_dirs]

you probably don't want that under if CONFIG['MOZ_UPDATER']
Attachment #787305 - Flags: review?(mh+mozilla) → review+
(In reply to Mike Hommey [:glandium] from comment #2)
> Comment on attachment 787305 [details] [diff] [review]
> bug 902316 - add an external tier that builds a number of external projects
> in parallel
> 
> Review of attachment 787305 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: config/external/moz.build
> @@ +6,5 @@
> > +if not CONFIG['MOZ_NATIVE_JPEG']:
> > +    external_dirs += ['media/libjpeg']
> > +
> > +if CONFIG['MOZ_UPDATER']:
> > +    if not CONFIG['MOZ_NATIVE_BZ2']:
> 
> if CONFIG['MOZ_UPDATER'] and not CONFIG['MOZ_NATIVE_BZ2']:

I just cut and pasted, but might as well clean it up.

> @@ +63,5 @@
> > +
> > +if CONFIG['MOZ_UPDATER']:
> > +    external_dirs += ['modules/libmar']
> > +
> > +    PARALLEL_DIRS += ['../../' + i for i in external_dirs]
> 
> you probably don't want that under if CONFIG['MOZ_UPDATER']

I so wish python had braces
https://hg.mozilla.org/integration/mozilla-inbound/rev/f77dd1e2e651
Whiteboard: looks like libmar can be built such that it depends on nss :(
(In reply to Trevor Saunders (:tbsaunde) from comment #5)
> https://hg.mozilla.org/integration/mozilla-inbound/rev/f77dd1e2e651

backed out because the libmar signing stuff depends on nss
Comment on attachment 788380 [details] [diff] [review]
bug 902316 - fix libmar signing stuff

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

Restoring libmar to platform tier works for me!

I look forward to moving nspr, nss, and js into the new external tier!
Attachment #788380 - Flags: review?(gps) → review+
Merged, fixed syntax error in a moz.build file (extra indent) and pushed:

https://hg.mozilla.org/integration/mozilla-inbound/rev/18fbebfda0cd
Blocks: 903630
and we build a ton of libraries in media/omx-plugin/ which have some interdependancies so I backed that part out in https://hg.mozilla.org/integration/mozilla-inbound/rev/2f65b3e077b9 :/
and because I'm a clown including large red nose, floppy shoes and all https://hg.mozilla.org/integration/mozilla-inbound/rev/0d82b5144c5e
Attachment #788874 - Flags: review?(trev.saunders)
Comment on attachment 788874 [details] [diff] [review]
Add a license header

err, yeah
Attachment #788874 - Flags: review?(trev.saunders) → review+
https://hg.mozilla.org/mozilla-central/rev/5d4c86b0d72c
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla26
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.