Revert of Automatically copy the DIA DLL in the Syzygy binaries directory.

build/get_syzygy_binaries.py

Index: build/get_syzygy_binaries.py
diff --git a/build/get_syzygy_binaries.py b/build/get_syzygy_binaries.py
index ec13618d20b50893eb977f73e7003ad40c1666f3..1cab3fcf48dfd21f8c54e6492101f9d5df2e6300 100755
--- a/build/get_syzygy_binaries.py
+++ b/build/get_syzygy_binaries.py
@@ -46,10 +46,6 @@
   ('binaries.zip', 'binaries', 'exe', None),
   ('symbols.zip', 'symbols', 'exe',
       lambda x: x.filename.endswith('.dll.pdb'))]
-
-
-# Name of the MS DIA dll that we need to copy to the binaries directory.
-_DIA_DLL_NAME = "msdia140.dll"
 
 
 def _LoadState(output_dir):
@@ -286,29 +282,6 @@
   return tmp[1]
 
 
-def _CopyDIABinaries(options, contents):
-  """Copy the DIA DLL to the binaries exe directory."""
-  toolchain_data_file = os.path.join(os.path.dirname(__file__),
-                                     'win_toolchain.json')
-  if not os.path.exists(toolchain_data_file):
-    raise Exception('Toolchain JSON data file doesn\'t exist.')
-
-  with open(toolchain_data_file) as temp_f:
-    toolchain_data = json.load(temp_f)
-  if not os.path.isdir(toolchain_data['path']):
-    raise Exception('The toolchain JSON file is invalid.')
-  dia_sdk_binaries_dir = os.path.join(toolchain_data['path'], 'DIA SDK', 'bin')
-  dia_dll = os.path.join(dia_sdk_binaries_dir, _DIA_DLL_NAME)
-  if not os.path.exists(dia_dll):
-    raise Exception('%s is missing.')
-  dia_dll_dest = os.path.join(options.output_dir, 'exe', _DIA_DLL_NAME)
-  _LOGGER.debug('Copying %s to %s.' % (dia_dll, dia_dll_dest))
-  if not options.dry_run:
-    shutil.copy(dia_dll, dia_dll_dest)
-    contents[os.path.relpath(dia_dll_dest, options.output_dir)] = (
-        _Md5(dia_dll_dest))
-
-
 def _InstallBinaries(options, deleted={}):
   """Installs Syzygy binaries. This assumes that the output directory has
   already been cleaned, as it will refuse to overwrite existing files."""
@@ -362,10 +335,6 @@
 
     _LOGGER.debug('Removing temporary file "%s".', path)
     os.remove(path)
-
-  if options.copy_dia_binaries:
-    # Copy the DIA binaries to the binaries directory.
-    _CopyDIABinaries(options, contents)
 
   return state
 
@@ -398,9 +367,6 @@
   option_parser.add_option('--quiet', dest='log_level', action='store_const',
       default=logging.INFO, const=logging.ERROR,
       help='Disables all output except for errors.')
-  option_parser.add_option('--copy-dia-binaries', action='store_true',
-      default=False, help='If true then the DIA dll will get copied into the '
-                          'binaries directory.')
   options, args = option_parser.parse_args()
   if args:
     option_parser.error('Unexpected arguments: %s' % args)