917086 - Disallow DIRS, PARALLEL_DIRS and TEST_DIRS under TOOL_DIRS and TEST_TOOL_DIRS

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

Currently, it's hard to track whether a deep directory is a TOOL_DIR or TEST_TOOL_DIR, because it may be indirectly inheriting that property from one of its parent, from how the tree is traversed with the make rules. It would be clearer (and would help further changes) if subdirectories of TOOL_DIR/TEST_TOOL_DIR were explicitly marked as such. The easiest way there is to disallow DIRS, PARALLEL_DIRS and TEST_DIR there.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Replace DIRS and TEST_DIRS appropriately in directories that are either TOOL_DIRS or TEST_TOOL_DIRS

Comment 2

[Mike Hommey [:glandium]]

Attachment: Disallow DIRS, PARALLEL_DIRS and TEST_DIRS under TOOL_DIRS and TEST_TOOL_DIRS

Comment 3

[Mike Hommey [:glandium]]

Attachment: Disallow DIRS, PARALLEL_DIRS and TEST_DIRS under TOOL_DIRS and TEST_TOOL_DIRS, and adapt moz.build files accordingly.

Also mark TOOL_DIRS/TEST_TOOL_DIRS directories in backend.mk and recurse them normally instead of forcing make -C dir libs for them.

---

So, it turns out the previous iteration was breaking the tree when not used in conjunction with bug 917086. And this was due to us recursing those directories with make libs. So now, we always recurse them with make tools.

Comment 4

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8dd27d839acc

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/8dd27d839acc