Updates to package VS 2015 to not require UCRT

win_toolchain/package_from_installed.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 From a system-installed copy of the toolchain, packages all the required bits
 into a .zip file.
 
 It assumes default install locations for tools, in particular:
 - C:\Program Files (x86)\Microsoft Visual Studio 12.0\...
 - C:\Program Files (x86)\Windows Kits\10\...
 
 1. Start from a fresh Win7 VM image.
 2. Install VS Pro. Deselect everything except MFC.
 3. Install Windows 10 SDK. Select only the Windows SDK and Debugging Tools for
 Windows.
 4. Run this script, which will build a <sha1>.zip.
 
 Express is not yet supported by this script, but patches welcome (it's not too
 useful as the resulting zip can't be redistributed, and most will presumably
 have a Pro license anyway).
 """
 
+import glob
 import optparse
 import os
 import platform
 import shutil
 import sys
 import tempfile
 import zipfile
 
 import get_toolchain_if_necessary
 
@@ skipping 26 matching lines @@
         ('VC/redist/Debug_NonRedist/x86/Microsoft.VC120.DebugCRT', 'sys32'),
         ('VC/redist/Debug_NonRedist/x86/Microsoft.VC120.DebugMFC', 'sys32'),
         ('VC/redist/x64/Microsoft.VC120.CRT', 'sys64'),
         ('VC/redist/x64/Microsoft.VC120.MFC', 'sys64'),
         ('VC/redist/Debug_NonRedist/x64/Microsoft.VC120.DebugCRT', 'sys64'),
         ('VC/redist/Debug_NonRedist/x64/Microsoft.VC120.DebugMFC', 'sys64'),
     ]
   elif VS_VERSION == '2015':
     paths += [
         ('VC/redist/x86/Microsoft.VC140.CRT', 'sys32'),
+        ('VC/redist/x86/Microsoft.VC140.CRT', 'win_sdk/bin/x86'),
         ('VC/redist/x86/Microsoft.VC140.MFC', 'sys32'),
         ('VC/redist/debug_nonredist/x86/Microsoft.VC140.DebugCRT', 'sys32'),
         ('VC/redist/debug_nonredist/x86/Microsoft.VC140.DebugMFC', 'sys32'),
         ('VC/redist/x64/Microsoft.VC140.CRT', 'sys64'),
+        ('VC/redist/x64/Microsoft.VC140.CRT', 'VC/bin/amd64_x86'),
+        ('VC/redist/x64/Microsoft.VC140.CRT', 'VC/bin/amd64'),
+        ('VC/redist/x64/Microsoft.VC140.CRT', 'win_sdk/bin/x64'),
         ('VC/redist/x64/Microsoft.VC140.MFC', 'sys64'),
         ('VC/redist/debug_nonredist/x64/Microsoft.VC140.DebugCRT', 'sys64'),
         ('VC/redist/debug_nonredist/x64/Microsoft.VC140.DebugMFC', 'sys64'),
     ]
   else:
     raise ValueError('VS_VERSION %s' % VS_VERSION)
 
   if VS_VERSION == '2013':
     vs_path = r'C:\Program Files (x86)\Microsoft Visual Studio 12.0'
   else:
@@ skipping 60 matching lines @@
         'Windows6.1-KB2999226-x64.msu',
         'Windows8-RT-KB2999226-x64.msu',
         'Windows8.1-KB2999226-x64.msu',
     ]
 
     for installer in universal_runtime_installers:
       result.append((os.path.join(os.environ['userprofile'], 'downloads',
                                   installer),
                      os.path.join('installers', installer)))
 
-    system_crt_files = [
-        # Needed to let debug binaries run.
-        'ucrtbased.dll',
-    ]
-    bitness = platform.architecture()[0]
-    # When running 64-bit python the x64 DLLs will be in System32
-    x64_path = 'System32' if bitness == '64bit' else 'Sysnative'
-    x64_path = os.path.join(r'C:\Windows', x64_path)
-    for system_crt_file in system_crt_files:
-        result.append((os.path.join(r'C:\Windows\SysWOW64', system_crt_file),
-                       os.path.join('sys32', system_crt_file)))
-        result.append((os.path.join(x64_path, system_crt_file),
-                       os.path.join('sys64', system_crt_file)))
+    if VS_VERSION == '2015':
+      # Copy the x86 ucrt DLLs to all directories with 32-bit binaries that are
+      # added to the path by SetEnv.cmd, and to sys32.
+      ucrt_paths = glob.glob(os.path.join(sdk_path, r'redist\ucrt\dlls\x86\*'))
+      for ucrt_path in ucrt_paths:
+        ucrt_file = os.path.split(ucrt_path)[1]
+        for dest_dir in [ r'win_sdk\bin\x86', 'sys32' ]:
+          result.append((ucrt_path, os.path.join(dest_dir, ucrt_file)))
+      # Copy the x64 ucrt DLLs to all directories with 64-bit binaries that are

[scottmg, 2016/02/03 04:12:00]

nit; add a blank line before this comment

[brucedawson, 2016/02/03 06:32:15]

Done.

+      # added to the path by SetEnv.cmd, and to sys64.
+      ucrt_paths = glob.glob(os.path.join(sdk_path, r'redist\ucrt\dlls\x64\*'))
+      for ucrt_path in ucrt_paths:
+        ucrt_file = os.path.split(ucrt_path)[1]
+        for dest_dir in [ r'VC\bin\amd64_x86', r'VC\bin\amd64',
+                          r'win_sdk\bin\x64', 'sys64']:
+          result.append((ucrt_path, os.path.join(dest_dir, ucrt_file)))
+
+      system_crt_files = [
+          # Needed to let debug binaries run.
+          'ucrtbased.dll',
+      ]
+      bitness = platform.architecture()[0]
+      # When running 64-bit python the x64 DLLs will be in System32
+      x64_path = 'System32' if bitness == '64bit' else 'Sysnative'
+      x64_path = os.path.join(r'C:\Windows', x64_path)
+      for system_crt_file in system_crt_files:
+          result.append((os.path.join(r'C:\Windows\SysWOW64', system_crt_file),
+                         os.path.join('sys32', system_crt_file)))
+          result.append((os.path.join(x64_path, system_crt_file),
+                         os.path.join('sys64', system_crt_file)))
 
   # Generically drop all arm stuff that we don't need, and
   # drop .msi files because we don't need installers.
   return [(f, t) for f, t in result if 'arm\\' not in f.lower() and
                                        'arm64\\' not in f.lower() and
                                        not f.lower().endswith('.msi')]
 
 
 def GenerateSetEnvCmd(target_dir):
   """Generate a batch file that gyp expects to exist to set up the compiler
   environment.
 
   This is normally generated by a full install of the SDK, but we
   do it here manually since we do not do a full install."""
   with open(os.path.join(
         target_dir, r'win_sdk\bin\SetEnv.cmd'), 'w') as f:
     f.write('@echo off\n'
             ':: Generated by win_toolchain\\package_from_installed.py.\n'
             # Common to x86 and x64
             'set VSINSTALLDIR=%~dp0..\\..\\\n'
             'set VCINSTALLDIR=%~dp0..\\..\\VC\\\n'
-            'set PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n'
             'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\um;'
             '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;'
             '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'.replace(
                 'WINVERSION', WIN_VERSION))
     if VS_VERSION == '2015':
       f.write('%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;'.replace(
                   'WINVERSION', WIN_VERSION))
     f.write('%~dp0..\\..\\VC\\include;'
             '%~dp0..\\..\\VC\\atlmfc\\include\n')
 
@@ skipping 122 matching lines @@
   sys.stdout.write('\rWrote to %s.%s\n' % (output, ' '*50))
   sys.stdout.flush()
 
   RenameToSha1(output)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())