Bug 1523537 - Remove WIN_DIA_SDK_BIN_DIR as a thing that can be set manually. r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 29 Jan 2019 14:22:26 +0000
changeset 455985 b29080fdd01faf2068b84ccbf02ac29ef3715255
parent 455984 07d1d28e3b0a9d95ddfaa85dedccf252353b1fbc
child 455986 3b0293ddc8eaeb4646c817f148dc9fd3ff1ed8b7
push id35465
push usershindli@mozilla.com
push dateWed, 30 Jan 2019 04:10:12 +0000
treeherdermozilla-central@9e919be867b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1523537
milestone67.0a1
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 1523537 - Remove WIN_DIA_SDK_BIN_DIR as a thing that can be set manually. r=dmajor Now that it's automatically derived and that in-tree mozconfigs are setting DIA_SDK_PATH, we don't need to set WIN_DIA_SDK_BIN_DIR on automation, or elsewhere, for that matter. Differential Revision: https://phabricator.services.mozilla.com/D17915
build/moz.configure/windows.configure
build/win32/mozconfig.vs2017
build/win64-aarch64/mozconfig.vs2017
build/win64/mozconfig.vs2017
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -353,31 +353,17 @@ def dia_sdk_subdir(host_or_target, subdi
         # interpret as a "string continues on next line" indicator, use variable
         # args.
         old_target = (old_target,) if old_target else ()
         return os.path.join(dia_sdk_dir, subdir, *old_target)
 
     return dia_sdk_subdir
 
 
-# XXX: remove after bug 1523201
-js_option(env='WIN_DIA_SDK_BIN_DIR', nargs=1, help='Path to the DIA DLLs')
-
-
-@depends('WIN_DIA_SDK_BIN_DIR', dia_sdk_subdir(host, 'bin'))
-@imports('os')
-def dia_sdk_bin_dir(from_env, guessed):
-    if from_env:
-        if not os.path.isdir(from_env[0]):
-            die('Invalid Windows DIA SDK directory: {}'.format(from_env))
-        return from_env[0]
-    return guessed
-
-
-set_config('WIN_DIA_SDK_BIN_DIR', dia_sdk_bin_dir)
+set_config('WIN_DIA_SDK_BIN_DIR', dia_sdk_subdir(host, 'bin'))
 
 
 @template
 def lib_path_for(host_or_target):
     @depends(host_or_target, dependable(host_or_target is host), vc_path,
              valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_subdir(host_or_target, 'lib'))
     @imports('os')
     def lib_path(target, is_host, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_lib_dir):
--- a/build/win32/mozconfig.vs2017
+++ b/build/win32/mozconfig.vs2017
@@ -4,17 +4,16 @@ if [ -z "${VSPATH}" ]; then
 fi
 
 if [ -d "${VSPATH}" ]; then
     VSWINPATH="$(cd ${VSPATH} && pwd -W)"
 
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT"
     export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 
     win_sdk_version="10.0.17134.0"
 
     export WIN64_LINK="${VSPATH}/VC/bin/Hostx64/x64/link.exe"
     export WIN64_LIB="${VSPATH}/VC/lib/x64:${VSPATH}/VC/atlmfc/lib/x64:${VSPATH}/SDK/Lib/${win_sdk_version}/ucrt/x64:${VSPATH}/SDK/Lib/${win_sdk_version}/um/x64:${VSPATH}/DIA SDK/lib/amd64"
 fi
--- a/build/win64-aarch64/mozconfig.vs2017
+++ b/build/win64-aarch64/mozconfig.vs2017
@@ -3,17 +3,16 @@ if [ -z "${VSPATH}" ]; then
     VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.9.6"
 fi
 
 if [ -d "${VSPATH}" ]; then
     VSWINPATH="$(cd ${VSPATH} && pwd -W)"
 
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR=${VSPATH}/VC/redist/arm64/Microsoft.VC141.CRT
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 
     win_sdk_version="10.0.17134.0"
 
     export WIN64_LINK="${VSPATH}/VC/bin/Hostx64/x64/link.exe"
     export WIN64_LIB="${VSPATH}/VC/lib/x64:${VSPATH}/VC/atlmfc/lib/x64:${VSPATH}/SDK/Lib/${win_sdk_version}/ucrt/x64:${VSPATH}/SDK/Lib/${win_sdk_version}/um/x64:${VSPATH}/DIA SDK/lib/amd64"
 fi
--- a/build/win64/mozconfig.vs2017
+++ b/build/win64/mozconfig.vs2017
@@ -4,12 +4,11 @@ if [ -z "${VSPATH}" ]; then
 fi
 
 if [ -d "${VSPATH}" ]; then
     VSWINPATH="$(cd ${VSPATH} && pwd -W)"
 
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT
     export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 fi