Fix Windows bustage. Port bug 999260 to comm-central. r=jcranmer over IRC
authorRichard Marti <richard.marti@gmail.com>
Sat, 03 May 2014 20:29:09 +0200
changeset 16148 5b43432cf4cd
parent 16147 822aa6af5869
child 16149 8903d7cc81af
push id10101
push userrichard.marti@gmail.com
push dateSat, 03 May 2014 18:31:12 +0000
treeherdercomm-central@5b43432cf4cd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs999260
Fix Windows bustage. Port bug 999260 to comm-central. r=jcranmer over IRC
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/installer/Makefile.in
mail/installer/package-manifest.in
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-debug
 ac_add_options --enable-trace-malloc
 ac_add_options --enable-signmar
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 export MOZ_TELEMETRY_REPORTING=1
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -1,14 +1,15 @@
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
+ac_add_options --enable-require-all-d3dc-versions
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -47,17 +47,18 @@ endif
 ifdef _MSC_VER
 DEFINES += -D_MSC_VER=$(_MSC_VER)
 endif
 
 DEFINES += -DJAREXT=
 
 ifdef MOZ_ANGLE_RENDERER
 DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
-DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
 endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_NATIVE_NSPR
 DEFINES += -DMOZ_NATIVE_NSPR=1
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -96,18 +96,26 @@
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #else
 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
 #endif
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
 @BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DCOMPILER_DLL@
+
+#ifdef MOZ_D3DCOMPILER_VISTA_DLL
+@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
 #endif
+
+#ifdef MOZ_D3DCOMPILER_XP_DLL
+@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
+#endif
+
+#endif # MOZ_ANGLE_RENDERER
 #ifndef MOZ_NATIVE_ICU
 #ifdef MOZ_SHARED_ICU
 #ifdef XP_WIN
 #ifdef MOZ_DEBUG
 @BINPATH@/icudtd@MOZ_ICU_VERSION@.dll
 @BINPATH@/icuind@MOZ_ICU_VERSION@.dll
 @BINPATH@/icuucd@MOZ_ICU_VERSION@.dll
 #else