1005630 - Fix Windows bustage. Port bug 999260 and bug 1003812 to SeaMonkey comm-central

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Philip Chee]

References:
TB Changesets:
http://hg.mozilla.org/comm-central/rev/80f0080632dd
http://hg.mozilla.org/comm-central/rev/5b43432cf4cd
Firefox Bugs:
Bug 999260 - Ship both d3dcompiler _43 and _46+ for use by ANGLE
Bug 1003812 - WindowsGamepad.cpp

Comment 1

[Edmund Wong (:ewong)]

Attachment: Port patch (v1)

Comment 2

[Ian Neal]

(In reply to Edmund Wong (:ewong) from comment #1)
> Created attachment 8417033 [details] [diff] [review]
> Port patch (v1)

Isn't this patch missing:
+ac_add_options --enable-require-all-d3dc-versions

Comment 3

[Philip Chee]

Regression fixes:
Bug 1005456 - fails to make win32 build .zip package unless all versions of d3c are found
Bug 1005484 - [MSVC10 Build bustage] 'd3dcompiler_47.dll': No such file or directory

Comment 4

[Philip Chee]

Comment on attachment 8417033 [details] [diff] [review]
Port patch (v1)

> +ifdef MOZ_D3DCOMPILER_VISTA_DLL
Typo. This should be #ifdef

> +@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
> #endif
> +

Comment 5

[Philip Chee]

You probably need this bit from Bug 1005456:

>  ifdef MOZ_ANGLE_RENDERER
>  DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
> +ifdef MOZ_D3DCOMPILER_VISTA_DLL
>  DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
> +endif
> +ifdef MOZ_D3DCOMPILER_XP_DLL
>  DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
>  endif
> +endif

Comment 6

[Edmund Wong (:ewong)]

Attachment: Port patch (v2)

Comment 7

[Edmund Wong (:ewong)]

Attachment: Port patch (v3)

Comment 8

[Joshua Cranmer [:jcranmer]]

Comment on attachment 8417369 [details] [diff] [review]
Port patch (v3)

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

From some channel talk I've overhead, it sounds like we may end up requiring the Windows 8 SDK eventually, so it might be prudent for you to work towards getting the Win8 SDK installed on SM builders.

Comment 9

[Edmund Wong (:ewong)]

(In reply to Joshua Cranmer [:jcranmer] from comment #8)
> Comment on attachment 8417369 [details] [diff] [review]
> Port patch (v3)
> 
> Review of attachment 8417369 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> From some channel talk I've overhead, it sounds like we may end up requiring
> the Windows 8 SDK eventually, so it might be prudent for you to work towards
> getting the Win8 SDK installed on SM builders.

Looking at the Windows 8 SDK requirements, I don't think that's possible
with the SM builders as the SDK requires 2012, 2008R2, Win8 and Win7. 
Our SM builders use 2003.  Will need to upgrade/migrate them to 2008 or 8.

Comment 10

[Edmund Wong (:ewong)]

Pushed to comm-central:
http://hg.mozilla.org/comm-central/rev/459b1b91a901