win_toolchain: Update packaging script to package win10 sdk

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\8.1\...
+- 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 8 SDK. Select only the Windows SDK and Debugging Tools for
+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 os
 import shutil
@@ skipping 73 matching lines @@
             with open(final_from, 'rb') as unpatched_f:
               unpatched_contents = unpatched_f.read()
             os.write(handle,
                 unpatched_contents.replace('warning(disable: 4127)',
                                            'warning(disable: 4127 4702)'))
             result.append((patched, dest))
           else:
             result.append((final_from, dest))
 
   # Just copy the whole SDK.
-  sdk_path = r'C:\Program Files (x86)\Windows Kits\8.1'
+  sdk_path = r'C:\Program Files (x86)\Windows Kits\10'
   for root, _, files in os.walk(sdk_path):
     for f in files:
       combined = os.path.normpath(os.path.join(root, f))
       to = os.path.join('win_sdk', combined[len(sdk_path) + 1:])
       result.append((combined, to))
 
   if VS_VERSION == '2015':
     for ucrt_path in (
         (r'C:\Program Files (x86)\Windows Kits\10\Include', 'Include'),
         (r'C:\Program Files (x86)\Windows Kits\10\Lib', 'Lib'),
@@ skipping 48 matching lines @@
   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 PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n'
-            'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\um;'
-               '%~dp0..\\..\\win_sdk\\Include\\shared;'
-               '%~dp0..\\..\\win_sdk\\Include\\winrt;'
-               '%~dp0..\\..\\ucrt\\Include\\10.0.10056.0\\ucrt;'
+            'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\10.0.10240.0\\um;'
+               '%~dp0..\\..\\win_sdk\\Include\\10.0.10240.0\\shared;'
+               '%~dp0..\\..\\win_sdk\\Include\\10.0.10240.0\\winrt;'
                '%~dp0..\\..\\VC\\include;'
                '%~dp0..\\..\\VC\\atlmfc\\include\n'
             'if "%1"=="/x64" goto x64\n')
 
     # x86. Always use amd64_x86 cross, not x86 on x86.
     f.write('set PATH=%~dp0..\\..\\win_sdk\\bin\\x86;'
               '%~dp0..\\..\\VC\\bin\\amd64_x86;'
               '%~dp0..\\..\\VC\\bin\\amd64;'  # Needed for mspdb1x0.dll.
               '%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib;'
-               '%~dp0..\\..\\win_sdk\\Lib\\winv6.3\\um\\x86;'
-               '%~dp0..\\..\\ucrt\\Lib\\10.0.10056.0\\ucrt\\x86;'
+               '%~dp0..\\..\\win_sdk\\Lib\\10.0.10240.0\\um\\x86;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\n'
             'goto :EOF\n')
 
     # x64.
     f.write(':x64\n'
             'set PATH=%~dp0..\\..\\win_sdk\\bin\\x64;'
                 '%~dp0..\\..\\VC\\bin\\amd64;'
                 '%PATH%\n')
     f.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;'
-               '%~dp0..\\..\\win_sdk\\Lib\\winv6.3\\um\\x64;'
-               '%~dp0..\\..\\ucrt\\Lib\\10.0.10056.0\\ucrt\\x64;'
+               '%~dp0..\\..\\win_sdk\\Lib\\10.0.10240.0\\um\\x64;'
                '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n')
 
 
 def AddEnvSetup(files):
   """We need to generate this file in the same way that the "from pieces"
   script does, so pull that in here."""
   tempdir = tempfile.mkdtemp()
   os.makedirs(os.path.join(tempdir, 'win_sdk', 'bin'))
   GenerateSetEnvCmd(tempdir)
   files.append((os.path.join(tempdir, 'win_sdk', 'bin', 'SetEnv.cmd'),
                 'win_sdk\\bin\\SetEnv.cmd'))
   vs_version_file = os.path.join(tempdir, 'VS_VERSION')
   with open(vs_version_file, 'wb') as version:
     print >>version, VS_VERSION
   files.append((vs_version_file, 'VS_VERSION'))
 
 
 def RenameToSha1(output):
   """Determine the hash in the same way that the unzipper does to rename the
   # .zip file."""
   print 'Extracting to determine hash...'
   tempdir = tempfile.mkdtemp()
   old_dir = os.getcwd()
   os.chdir(tempdir)
-  rel_dir = 'vs_files'
+  if VS_VERSION == '2013':
+    rel_dir = 'vs2013_files'
+  else:
+    rel_dir = 'vs_files'
   with zipfile.ZipFile(
       os.path.join(old_dir, output), 'r', zipfile.ZIP_DEFLATED, True) as zf:
     zf.extractall(rel_dir)
   print 'Hashing...'
   sha1 = get_toolchain_if_necessary.CalculateHash(rel_dir)
   os.chdir(old_dir)
   shutil.rmtree(tempdir)
   final_name = sha1 + '.zip'
   os.rename(output, final_name)
   print 'Renamed %s to %s.' % (output, final_name)
@@ skipping 30 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())