Skip include\ucrt on VS 2013 packages

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\...
@@ skipping 169 matching lines @@
   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;'
-               '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;' # VS 2015
-               '%~dp0..\\..\\VC\\include;'
-               '%~dp0..\\..\\VC\\atlmfc\\include\n'
-            'if "%1"=="/x64" goto x64\n'.replace('WINVERSION', WIN_VERSION))

[brucedawson, 2016/02/03 18:56:51]

Ah crap. I accidentally deleted this whole line when I was only supposed to
delete the .replace(). This is causing breakage on the new VS 2015 package, but
I'm not sure why it didn't cause problems before. No packages created since
then?

+            '%~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')
 
     # 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\\WINVERSION\\um\\x86;'
                '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\ucrt\\x86;' # VS 2015

[scottmg, 2016/01/21 00:50:49]

This too?

[brucedawson, 2016/01/21 00:55:49]

Well, technically. The downside is it requires uglifying the code, and it isn't
actually *necessary* because the only libs in there are libucrt[d].lib and
ucrt[d].lib, which are never referenced.

So, I can remove those references as well, but I'm tempted not to. Thoughts?

[scottmg, 2016/01/21 00:59:39]

OK. We should delete WINVERSION after we switch anyway and make this 2015-only,
so lgtm either way.

                '%~dp0..\\..\\VC\\atlmfc\\lib\n'
             'goto :EOF\n'.replace('WINVERSION', WIN_VERSION))
 
     # 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\\WINVERSION\\um\\x64;'
                '%~dp0..\\..\\win_sdk\\Lib\\WINVERSION\\ucrt\\x64;' # VS 2015

[scottmg, 2016/01/21 00:50:49]

And here

                '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n'
                .replace('WINVERSION', WIN_VERSION))
 
 
 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)
@@ skipping 93 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())