Closed Bug 1479210 Opened 3 years ago Closed 3 years ago

Change suite configs for mozilla as topsourcedir and infrastructure changes

Categories

(SeaMonkey :: Build Config, defect)

SeaMonkey 2.57 Branch
defect
Not set
blocker

Tracking

(seamonkey2.57esr affected, seamonkey2.60 fixed)

RESOLVED FIXED
seamonkey2.60
Tracking Status
seamonkey2.57esr --- affected
seamonkey2.60 --- fixed

People

(Reporter: frg, Assigned: frg)

References

Details

Attachments

(2 files, 2 obsolete files)

Support for building comm-central as topsourcedir has been deprecated. The build files in comm-central /build have been largely removed. comm-central is now located as a subdirectory under mozilla-central named comm. 

We need to take this into acocunt in the config files. Also some build options are no longer valid.
Attached patch 1479210-confignewinfra.patch (obsolete) — Splinter Review
Not that I expect it to build on first try :)

What about webrender and stylo? I think both options need to be enabled. stylo is now the only choice anyway and webrender support should at least build on the new infra. is mozconfig.gtk still needed with the new builders?
Attachment #8995735 - Flags: review?(ewong)
Comment on attachment 8995735 [details] [diff] [review]
1479210-confignewinfra.patch

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

for all files, please fix.

::: suite/config/mozconfigs/linux32/debug
@@ +1,3 @@
>  . $topsrcdir/build/mozconfig.comm-support
>  
> +TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir/comm

You are missing a } after $topsrcdir.
Attachment #8995735 - Flags: review?(ewong) → review-
Attached patch 1479210-confignewinfra.patch (obsolete) — Splinter Review
Attachment #8995735 - Attachment is obsolete: true
Attachment #8997652 - Flags: review?(ewong)
Comment on attachment 8997652 [details] [diff] [review]
1479210-confignewinfra.patch

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

r+ with the change to mozconfig.linux.l10n.common.

::: suite/config/mozconfigs/mozconfig.linux.l10n.common
@@ +7,2 @@
>  # linux* builders.
>  . ${TOOLTOOL_DIR}/build/unix/mozconfig.gtk

Needs to point to the suite mozconfig dir.
Attachment #8997652 - Flags: review?(ewong) → review+
Comment on attachment 8997652 [details] [diff] [review]
1479210-confignewinfra.patch

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

Missed the fact that TOOLTOOL_DIR/comm/build/.. doesn't exist.

::: suite/config/mozconfigs/linux32/nightly
@@ +4,2 @@
>  
>  . $TOOLTOOL_DIR/build/unix/mozconfig.linux32

on second thoughts, there's something wrong here.

if TOOLTOOL_DIR is the original TOOLTOOL_DIR + /comm,
then $TOOLTOOL_DIR/build/unix/mozconfig.linux32 is wrong,
since comm/build/unix/.. doesn't exist.

Ergo.. 

I would believe if we have TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir},
then the other lines should be:

. $TOOLTOOL_DIR/comm/suite/...

::: suite/config/mozconfigs/mozconfig.linux.l10n.common
@@ +7,2 @@
>  # linux* builders.
>  . ${TOOLTOOL_DIR}/build/unix/mozconfig.gtk

Needs to point to the suite mozconfig dir.
Attachment #8997652 - Flags: review+ → review-
Hopefully better. I also removed some of the workarounds for the broken builders (Rust + X11 + webrender).
Attachment #8997652 - Attachment is obsolete: true
Attachment #8998258 - Flags: review?(ewong)
Comment on attachment 8998258 [details] [diff] [review]
1479210-confignewinfra.patch

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

r+ with the clarification and fix.

::: suite/confvars.sh
@@ -13,1 @@
>  MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/suite/branding/seamonkey

Missed this one.

@@ -22,1 @@
>  

been wondering.  Is this part of the move?
Attachment #8998258 - Flags: review?(ewong) → review+
> ::: suite/confvars.sh

The other cleanups are in bug 1481067. I think I should move the change for confvars.sh from this one to it too. Not directly config related.
Pushed by frgrahl@gmx.net:
https://hg.mozilla.org/comm-central/rev/256398d3eabe
Change suite configs for mozilla as topsourcedir and new infrastructure. r=ewong
Status: ASSIGNED → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Pushed without the change to confvars.sh. Will update bug 1481067 for it.
Target Milestone: --- → seamonkey2.60
Attachment #8998258 - Flags: approval-comm-esr60?
Comment on attachment 8998258 [details] [diff] [review]
1479210-confignewinfra.patch

a=me
Attachment #8998258 - Flags: approval-comm-esr60? → approval-comm-esr60+
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Comment on attachment 8998258 [details] [diff] [review]
1479210-confignewinfra.patch

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

Please push a patch fix.

::: suite/config/mozconfigs/mozconfig.linux.l10n.common
@@ +7,2 @@
>  # linux* builders.
> +. $TOOLTOOL_DIR/comm/suite/config/mozconfigs/unix/mozconfig.gtk

Missed this in my review.  s/unix//
Ditto with mozconfig.linux.common
Also, now that Mozilla no longer use CentOS docker images, we need to put the following line
in the linux* mozconfigs:

export PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig

I think the mozconfig.linux.common one would be ok.
Status: REOPENED → ASSIGNED
Pushed by frgrahl@gmx.net:
https://hg.mozilla.org/comm-central/rev/020481090e4e
Follow-up fix for Linux configs. rs=bustage-fix
Status: ASSIGNED → RESOLVED
Closed: 3 years ago3 years ago
Resolution: --- → FIXED
Rebased 2.57 esr60 patch with the bustage fix included. The comm-central and comm-esr60 configs are for now identical. comm-esr60/build still contains some configs in esr60 and they are no longer used with this patch.
You need to log in before you can comment on or make changes to this bug.