Let package_from_installed write the build env into json files in addition to SetEnv.cmd

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 collections
 import glob
+import json
 import optparse
 import os
 import platform
 import shutil
 import sys
 import tempfile
 import zipfile
 
 import get_toolchain_if_necessary
 
@@ skipping 172 matching lines @@
     ['..', '..', 'win_sdk', 'Include', WIN_VERSION, 'shared'],
     ['..', '..', 'win_sdk', 'Include', WIN_VERSION, 'winrt'],
   ]
   if VS_VERSION == '2015':
     include_dirs.append(['..', '..', 'win_sdk', 'Include', WIN_VERSION, 'ucrt'])
   include_dirs.extend([
     ['..', '..', 'VC', 'include'],
     ['..', '..', 'VC', 'atlmfc', 'include'],
   ])
   # Common to x86 and x64
-  env = [
+  env = collections.OrderedDict([
     # Yuck: These two have a trailing \ character. No good way to represent this
     # in an OS-independent way.
     ('VSINSTALLDIR', [['..', '..\\']]),
     ('VCINSTALLDIR', [['..', '..', 'VC\\']]),
     ('INCLUDE', include_dirs),
-  ]
+  ])
   # x86. Always use amd64_x86 cross, not x86 on x86.
-  env_x86 = [
+  env_x86 = collections.OrderedDict([
     ('PATH', [
       ['..', '..', 'win_sdk', 'bin', 'x86'],
       ['..', '..', 'VC', 'bin', 'amd64_x86'],
       ['..', '..', 'VC', 'bin', 'amd64'],  # Needed for mspdb1x0.dll.
     ]),
     ('LIB', [
       ['..', '..', 'VC', 'lib'],
       ['..', '..', 'win_sdk', 'Lib', WIN_VERSION, 'um', 'x86'],
       ['..', '..', 'win_sdk', 'Lib', WIN_VERSION, 'ucrt', 'x86'],  # VS 2015
       ['..', '..', 'VC', 'atlmfc', 'lib'],
     ]),
-  ]
+  ])
   # x64.
-  env_x64 = [
+  env_x64 = collections.OrderedDict([
     ('PATH', [
       ['..', '..', 'win_sdk', 'bin', 'x64'],
       ['..', '..', 'VC', 'bin', 'amd64'],
     ]),
     ('LIB', [
       ['..', '..', 'VC', 'lib', 'amd64'],
       ['..', '..', 'win_sdk', 'Lib', WIN_VERSION, 'um', 'x64'],
       ['..', '..', 'win_sdk', 'Lib', WIN_VERSION, 'ucrt', 'x64'],  # VS 2015
       ['..', '..', 'VC', 'atlmfc', 'lib', 'amd64'],
     ]),
-  ]
+  ])
   def BatDirs(dirs):
     return ';'.join(['%~dp0' + os.path.join(*d) for d in dirs])
-  with open(os.path.join(target_dir, r'win_sdk\bin\SetEnv.cmd'), 'w') as f:
+  set_env_prefix = os.path.join(target_dir, r'win_sdk\bin\SetEnv')
+  with open(set_env_prefix + '.cmd', 'w') as f:
     f.write('@echo off\n'
             ':: Generated by win_toolchain\\package_from_installed.py.\n')
-    for var, dirs in env:
+    for var, dirs in env.iteritems():
       f.write('set %s=%s\n' % (var, BatDirs(dirs)))
     f.write('if "%1"=="/x64" goto x64\n')
 
-    for var, dirs in env_x86:
+    for var, dirs in env_x86.iteritems():
       f.write('set %s=%s%s\n' % (
           var, BatDirs(dirs), ';%PATH%' if var == 'PATH' else ''))
     f.write('goto :EOF\n')
 
     f.write(':x64\n')
-    for var, dirs in env_x64:
+    for var, dirs in env_x64.iteritems():
       f.write('set %s=%s%s\n' % (
           var, BatDirs(dirs), ';%PATH%' if var == 'PATH' else ''))
+  with open(set_env_prefix + '.x86.json', 'wb') as f:
+    assert not set(env.keys()) & set(env_x86.keys()), 'dupe keys'
+    json.dump(collections.OrderedDict(env.items() + env_x86.items()), f)
+  with open(set_env_prefix + '.x64.json', 'wb') as f:
+    assert not set(env.keys()) & set(env_x64.keys()), 'dupe keys'
+    json.dump(collections.OrderedDict(env.items() + env_x64.items()), f)
 
 
 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'))
@@ skipping 91 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())