| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 # | 4 # |
| 5 # Copies the given "win tool" (which the toolchain uses to wrap compiler | 5 # Copies the given "win tool" (which the toolchain uses to wrap compiler |
| 6 # invocations) and the environment blocks for the 32-bit and 64-bit builds on | 6 # invocations) and the environment blocks for the 32-bit and 64-bit builds on |
| 7 # Windows to the build directory. | 7 # Windows to the build directory. |
| 8 # | 8 # |
| 9 # The arguments are the visual studio install location and the location of the | 9 # The arguments are the visual studio install location and the location of the |
| 10 # win tool. The script assumes that the root build directory is the current dir | 10 # win tool. The script assumes that the root build directory is the current dir |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 146 |
| 147 if cpu == target_cpu: | 147 if cpu == target_cpu: |
| 148 for path in env['PATH'].split(os.pathsep): | 148 for path in env['PATH'].split(os.pathsep): |
| 149 if os.path.exists(os.path.join(path, 'cl.exe')): | 149 if os.path.exists(os.path.join(path, 'cl.exe')): |
| 150 vc_bin_dir = os.path.realpath(path) | 150 vc_bin_dir = os.path.realpath(path) |
| 151 break | 151 break |
| 152 | 152 |
| 153 # The Windows SDK include directories must be first. They both have a sal.h, | 153 # The Windows SDK include directories must be first. They both have a sal.h, |
| 154 # and the SDK one is newer and the SDK uses some newer features from it not | 154 # and the SDK one is newer and the SDK uses some newer features from it not |
| 155 # present in the Visual Studio one. | 155 # present in the Visual Studio one. |
| 156 # Having the Windows SDK first is also the only way to control which SDK |
| 157 # version is used. |
| 156 | 158 |
| 157 if win_sdk_path: | 159 if win_sdk_path: |
| 158 additional_includes = ('{sdk_dir}\\Include\\shared;' + | 160 additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\shared;' + |
| 159 '{sdk_dir}\\Include\\um;' + | 161 '{sdk_dir}\\Include\\10.0.10586.0\\um;' + |
| 160 '{sdk_dir}\\Include\\winrt;').format( | 162 '{sdk_dir}\\Include\\10.0.10586.0\\winrt;').format( |
| 161 sdk_dir=win_sdk_path) | 163 sdk_dir=win_sdk_path) |
| 162 env['INCLUDE'] = additional_includes + env['INCLUDE'] | 164 env['INCLUDE'] = additional_includes + env['INCLUDE'] |
| 163 env_block = _FormatAsEnvironmentBlock(env) | 165 env_block = _FormatAsEnvironmentBlock(env) |
| 164 with open('environment.' + cpu, 'wb') as f: | 166 with open('environment.' + cpu, 'wb') as f: |
| 165 f.write(env_block) | 167 f.write(env_block) |
| 166 | 168 |
| 167 # Create a store app version of the environment. | 169 # Create a store app version of the environment. |
| 168 if 'LIB' in env: | 170 if 'LIB' in env: |
| 169 env['LIB'] = env['LIB'] .replace(r'\VC\LIB', r'\VC\LIB\STORE') | 171 env['LIB'] = env['LIB'] .replace(r'\VC\LIB', r'\VC\LIB\STORE') |
| 170 if 'LIBPATH' in env: | 172 if 'LIBPATH' in env: |
| 171 env['LIBPATH'] = env['LIBPATH'].replace(r'\VC\LIB', r'\VC\LIB\STORE') | 173 env['LIBPATH'] = env['LIBPATH'].replace(r'\VC\LIB', r'\VC\LIB\STORE') |
| 172 env_block = _FormatAsEnvironmentBlock(env) | 174 env_block = _FormatAsEnvironmentBlock(env) |
| 173 with open('environment.winrt_' + cpu, 'wb') as f: | 175 with open('environment.winrt_' + cpu, 'wb') as f: |
| 174 f.write(env_block) | 176 f.write(env_block) |
| 175 | 177 |
| 176 assert vc_bin_dir | 178 assert vc_bin_dir |
| 177 print 'vc_bin_dir = "%s"' % vc_bin_dir | 179 print 'vc_bin_dir = "%s"' % vc_bin_dir |
| 178 | 180 |
| 179 | 181 |
| 180 if __name__ == '__main__': | 182 if __name__ == '__main__': |
| 181 main() | 183 main() |
| OLD | NEW |