969164 - Traverse js/src moz.builds from top-level configure.

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

This is the second and last step before completely getting rid of js/src/configure.in. This is about making js/src and top-level one build-system, at the make level.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Move libffi subconfigure invocation in build/autoconf/ffi.m4

Comment 2

[Mike Hommey [:glandium]]

Attachment: Move icu subconfigure invocation in build/autoconf/icu.m4

Comment 3

[Mike Hommey [:glandium]]

Attachment: Create subconfigure directory in the AC_OUTPUT_SUBDIRS wrapper

We happen to be lucky currently because e.g. build is created by config.status
before we subconfigure in build/clang-plugin. But further changes break that
luck.

Comment 4

[Mike Hommey [:glandium]]

Attachment: Move libffi subconfigure invocation in build/autoconf/ffi.m4

Refreshed against bug 748138

Comment 5

[Mike Hommey [:glandium]]

Attachment: Use per-directory config in sandboxes when reading moz.builds

Up to this patch: https://tbpl.mozilla.org/?tree=Try&rev=79c8b03d356b

Comment 6

[Mike Hommey [:glandium]]

Attachment: Traverse js/src moz.builds from top-level configure

Before, we would run configure in both top-level and js/src, and both
configures would traverse their own set of moz.builds, without actual
knowledge about the other. With this change, both configures still run,
but only top-level traverses moz.build files, and uses js/src's
config.status when traversing its moz.build files. This allows a better
sharing of information between both build systems and the removal of many
hacks.

This also moves running libffi and icu configure to top-level.

Standalone js builds still have their own configure doing moz.build traversal,
as before.

https://tbpl.mozilla.org/?tree=Try&rev=edbdaa406db4

(the Hf, r and ggc reds are addressed in this patch and in the try push for the next patch)

Comment 7

[Mike Hommey [:glandium]]

Attachment: Replace most BUILDING_JS uses with JS_STANDALONE

Before making top-level traverse js/src moz.build files, there was a need to
distinguish between top-level traversing e.g. top-level moz.build or
config/moz.build and js/src traversing them. With a single traversal of both
moz.build sets, we now only need to distinguish between js standalone builds
and gecko builds.

There is still, however, a need to distinguish between top-level vs. js/src
configure runs on gecko builds to make them subconfigure icu and libffi from
top-level instead of js/src in js standalone builds, or when choosing to make
js/src's config.status do something when run or not.

https://tbpl.mozilla.org/?tree=Try&rev=a7445e1bf1d6

Comment 8

[Mike Hommey [:glandium]]

(In reply to Mike Hommey [:glandium] from comment #5)
> Created attachment 8372187 [details] [diff] [review]
> Use per-directory config in sandboxes when reading moz.builds
> 
> Up to this patch: https://tbpl.mozilla.org/?tree=Try&rev=79c8b03d356b

I should mention that i could convert EXTERNAL_SOURCE_DIR to use this, but a couple weeks away from it being obsolete, I didn't want to risk breaking comm-central by touching it.

Comment 9

[Gregory Szorc [:gps]]

Comment on attachment 8372185 [details] [diff] [review]
Move libffi subconfigure invocation in build/autoconf/ffi.m4

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

LGTM.

Comment 10

[Gregory Szorc [:gps]]

Comment on attachment 8372026 [details] [diff] [review]
Move icu subconfigure invocation in build/autoconf/icu.m4

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

Looked at this side-by-side and didn't see any major differences.

Comment 11

[Gregory Szorc [:gps]]

Comment on attachment 8372187 [details] [diff] [review]
Use per-directory config in sandboxes when reading moz.builds

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

Nice.

Comment 12

[Gregory Szorc [:gps]]

Comment on attachment 8372189 [details] [diff] [review]
Traverse js/src moz.builds from top-level configure

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

Awesome patch. Would r+ again.

Some comments in /moz.build before checkin wouldn't hurt.

::: build/autoconf/ffi.m4
@@ +28,1 @@
>  if test "$BUILD_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then

No reindent?

::: build/autoconf/icu.m4
@@ +140,1 @@
>  if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then

No reindent?

::: python/mozbuild/mozbuild/frontend/reader.py
@@ +169,5 @@
>          relpath = mozpath.relpath(path, topsrcdir)
>          reldir = mozpath.dirname(relpath)
>  
> +        if mozpath.dirname(relpath) == 'js/src' and \
> +                not config.substs.get('JS_STANDALONE'):

This seems hacky. Meh.

Comment 13

[Gregory Szorc [:gps]]

Comment on attachment 8372190 [details] [diff] [review]
Replace most BUILDING_JS uses with JS_STANDALONE

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

This was an awesome patch series.

Comment 14

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c13cfe6108e5
https://hg.mozilla.org/integration/mozilla-inbound/rev/ff614668cec3
https://hg.mozilla.org/integration/mozilla-inbound/rev/4a9038718417
https://hg.mozilla.org/integration/mozilla-inbound/rev/06f5f22f1bb9
https://hg.mozilla.org/integration/mozilla-inbound/rev/2f0f52f627d7
https://hg.mozilla.org/integration/mozilla-inbound/rev/4e3b435b7d39

Comment 15

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/c13cfe6108e5
https://hg.mozilla.org/mozilla-central/rev/ff614668cec3
https://hg.mozilla.org/mozilla-central/rev/4a9038718417
https://hg.mozilla.org/mozilla-central/rev/06f5f22f1bb9
https://hg.mozilla.org/mozilla-central/rev/2f0f52f627d7
https://hg.mozilla.org/mozilla-central/rev/4e3b435b7d39