1530671 - Enable the NSS gyp build to distinguish a Mozilla build from a Comm build

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Kai Engert (:KaiE:)]

When building Mozilla, inside the build scripts, I must be able to detect, whether it's being built for Firefox, or for one of the Comm applications (Thunderbird/Suite).

The reason is bug 1529308 and bug 1529227.

Because cmsutil needs more symbols than Firefox wants to export, I'd like to build cmsutil only when NSS is built as part of a Thunderbird/Suite build, but not if it's build inside Firefox.

In theory I could look at the string names for MOZ_APP_BASENAME, and compare with the Thunderbird and Suite names, but that seems less ideal, should anyone produce a derived build with a different name, or if we ever change brand names.

It might be better to introduce a new variable for that.

How about adding MOZ_COMM=1 ?

Comment 1

[Kai Engert (:KaiE:)]

Attachment: 1530671-v1.patch - Mozilla part

Comment 2

[Kai Engert (:KaiE:)]

Attachment: comm-1530671-v1.patch - thunderbird part

Comment 3

[Kai Engert (:KaiE:)]

Attachment: comm-1530671-v2.patch - both thunderbird and suite

Comment 4

[Kai Engert (:KaiE:)]

Rob, does this approach make sense?

Comment 5

[Kai Engert (:KaiE:)]

Attachment: comm-1530671-v3.patch

Comment 6

[Rob Lemley [:rjl]]

How about using MOZ_BUILD_APP?

For Thunderbird it will be set to "comm/mail", and Seamonkey it's "comm/suite".

The other way I've seen it done in the build code is by checking for "$commtopsrcdir"..

Comment 7

[Kai Engert (:KaiE:)]

Thanks a lot, using commtopsrcdir works for me.

Comment 8

[Kai Engert (:KaiE:)]

Attachment: 1530671-v2.patch

This translates the CONFIG flag into a gyp variable, which is used by bug 1529308.

Comment 9

[Kai Engert (:KaiE:)]

Comment on attachment 9046778 [details] [diff] [review]
1530671-v2.patch

Ted, CONFIG['commtopsrcdir'] is only defined when we do a thunderbird of seamonkey build.

If set, it sets a gyp variable, so we can use it in the NSS build for bug 1529308.

Comment 10

[Magnus Melin [:mkmelin]]

If we can use MOZ_BUILD_APP I think that would be preferable.
Sooner rather than later I'd like to make progress with having comm-central essentially a branch off mozilla-central, and then commtopsrcdir would probably not be a thing anymore.

Comment 11

[Kai Engert (:KaiE:)]

Comment on attachment 9046778 [details] [diff] [review]
1530671-v2.patch

Ok, let me make a new patch that uses MOZ_BUILD_APP

Comment 12

[Kai Engert (:KaiE:)]

Attachment: 1530671-v3.patch

Comment 13

[Kai Engert (:KaiE:)]

Attachment: 1530671-v4.patch

patch v4 uses a simpler and more generic syntax

(found at https://searchfox.org/comm-central/source/mailnews/moz.build#86 )

Comment 14

[Kai Engert (:KaiE:)]

Attachment: Title: Enable the NSS gyp build to distinguish a Mozilla build from a Comm build

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/082a7bbf945a
Title: Enable the NSS gyp build to distinguish a Mozilla build from a Comm build r=glandium

Comment 16

[Daniel Varga [:dvarga]]

https://hg.mozilla.org/mozilla-central/rev/082a7bbf945a