Bug 630019 - the DXSDK way didn't work on build slaves! reverting to the way using the registry that was earlier reviewed by jag on bug 630019. r=jag, a=blocking2.0
authorBenoit Jacob <bjacob@mozilla.com>
Mon, 31 Jan 2011 23:29:46 -0500
changeset 61669 4a62f7e1f1289161b9e47d7bf2e5435bc4f5d818
parent 61668 a7287af461b576568e8fab40de9cfd15b26d9385
child 61670 73f7643d522d8d167b35c87b071ddfeaff7b7863
push id18441
push userbjacob@mozilla.com
push dateMon, 31 Jan 2011 23:30:19 +0000
treeherdermozilla-central@4a62f7e1f128 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjag, blocking2.0
bugs630019
milestone2.0b11pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 630019 - the DXSDK way didn't work on build slaves! reverting to the way using the registry that was earlier reviewed by jag on bug 630019. r=jag, a=blocking2.0
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6346,18 +6346,20 @@ MOZ_ARG_DISABLE_BOOL(angle,
     MOZ_ANGLE=,
     MOZ_ANGLE=1)
 
 if test -n "$MOZ_ANGLE"; then
   if test -z "$_WIN32_MSVC"; then
     AC_MSG_ERROR([Building ANGLE requires MSVC.  To build without ANGLE, reconfigure with --disable-angle.])
   fi
 
-  # remove trailing backslash
-  MOZ_DIRECTX_SDK_PATH=`echo $DXSDK_DIR|sed 's/\\\\\$//'`
+  # Get the SDK path from the registry.
+  MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK' | head -n 1`
+  MOZ_DIRECTX_SDK_PATH=`reg query "$MOZ_DIRECTX_SDK_REG_KEY" //v InstallPath | grep REG_SZ | sed 's,  *, ,g' | cut -d' ' -f4-`
+
   MOZ_ANGLE=
 
   if test -n "$MOZ_DIRECTX_SDK_PATH" ; then
     if test -f "$MOZ_DIRECTX_SDK_PATH"/include/d3dx9.h && test -f "$MOZ_DIRECTX_SDK_PATH"/lib/x86/dxguid.lib ; then
       AC_MSG_RESULT([Found DirectX SDK via DXSDK_DIR, using $MOZ_DIRECTX_SDK_PATH])
       MOZ_ANGLE=1
     fi
   fi