550846 - Restructure layers for multiple directories

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Bas Schouten (:bas.schouten)]

I just talked to Ted, if we want to have D3D in its own directory and the build work properly, we need to move the building of layers into their own directory as well. Since we cannot have subdirectories processed before the build actions in the directory itsself. Therefor I cannot currently build direct3d before linking, and I need to make gfx twice to pick up changes.

Comment 1

[Robert O'Callahan (:roc) (email my personal email if necessary)]

I see, we need a gfx/layers/build directory that actually links everything? OK.

Comment 2

[Bas Schouten (:bas.schouten)]

(In reply to comment #1)
> I see, we need a gfx/layers/build directory that actually links everything? OK.

There's an alternative of just structuring the files into directories, and then combining all in a single Makefile using VPATH. I believe Ted suggested this was a better way. I'm cool with this...?

Comment 3

[(not currently active) Ted Mielczarek]

I would prefer that, as it involves less recursive invocations of make. Your files will be separated into dirs, just not the build logic.

Comment 4

[Bas Schouten (:bas.schouten)]

Attachment: Restructure layers

I suggest this as a patch.

Comment 5

[Robert O'Callahan (:roc) (email my personal email if necessary)]

Use "hg rename". The basic plan is OK with me, get Ted to review the build system changes.

Comment 6

[Bas Schouten (:bas.schouten)]

Attachment: Restructure layers v2

I learned a new hg command!

Comment 7

[(not currently active) Ted Mielczarek]

Comment on attachment 431212 [details] [diff] [review]
Restructure layers v2

>diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
>--- a/gfx/layers/Makefile.in
>+++ b/gfx/layers/Makefile.in
>@@ -33,17 +33,20 @@
> # the provisions above, a recipient may use your version of this file under
> # the terms of any one of the MPL, the GPL or the LGPL.
> #
> # ***** END LICENSE BLOCK *****
> 
> DEPTH       = ../..
> topsrcdir   = @top_srcdir@
> srcdir      = @srcdir@
>-VPATH       = @srcdir@
>+VPATH       = \
>+            $(srcdir) \
>+            $(srcdir)/basic \
>+            $(NULL)

Please use a two-space indent on the continuation lines.

Comment 8

[Bas Schouten (:bas.schouten)]

Pushed http://hg.mozilla.org/mozilla-central/rev/fcd3ffeb34ef.

Comment 9

[Dão Gottwald [:dao]]

Is this fixed?

Comment 10

[Bas Schouten (:bas.schouten)]

It is.