| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 import os | 5 import os |
| 6 import shutil | 6 import shutil |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 | 9 |
| 10 p = ARGUMENTS.get('PROGRESS') | 10 p = ARGUMENTS.get('PROGRESS') |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] | 242 msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] |
| 243 msvs_drive = msvs_env['PATH'][0] | 243 msvs_drive = msvs_env['PATH'][0] |
| 244 else: | 244 else: |
| 245 msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''} | 245 msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''} |
| 246 msvs_drive = 'C' | 246 msvs_drive = 'C' |
| 247 | 247 |
| 248 # Use the absolute path for MSVC because it might not be on the same drive | 248 # Use the absolute path for MSVC because it might not be on the same drive |
| 249 # as our source checkout. | 249 # as our source checkout. |
| 250 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' | 250 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' |
| 251 | 251 |
| 252 # If side-by-side platform sdk is not available try local copy. |
| 253 platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files' |
| 254 if (root_env['PLATFORM'] in ['win32', 'cygwin'] and |
| 255 not os.path.exists(windows_env.subst(platform_sdk_path))): |
| 256 platform_sdk_path = ( |
| 257 msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0') |
| 258 |
| 252 windows_env.Replace( | 259 windows_env.Replace( |
| 253 CSCRIPT = 'c:\\Windows\\System32\\cscript', | 260 CSCRIPT = 'c:\\Windows\\System32\\cscript', |
| 254 | 261 |
| 255 PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', | 262 PLATFORMSDK_VISTA = platform_sdk_path, |
| 256 PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0', | |
| 257 VISUAL_STUDIO = visual_studio_path, | 263 VISUAL_STUDIO = visual_studio_path, |
| 258 | 264 |
| 259 CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), | 265 CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), |
| 260 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', | 266 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', |
| 261 | 267 |
| 262 PERL = '$CYGWIN_BIN_DIR/perl.exe', | 268 PERL = '$CYGWIN_BIN_DIR/perl.exe', |
| 263 | 269 |
| 264 MSVS_ENV = msvs_env, | 270 MSVS_ENV = msvs_env, |
| 265 | 271 |
| 266 YACC = '$CYGWIN_BIN_DIR/bison.exe', | 272 YACC = '$CYGWIN_BIN_DIR/bison.exe', |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 712 'all_libraries', | 718 'all_libraries', |
| 713 'all_languages', | 719 'all_languages', |
| 714 'all_programs', | 720 'all_programs', |
| 715 'all_test_programs', | 721 'all_test_programs', |
| 716 ], projects = [p], | 722 ], projects = [p], |
| 717 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 723 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 718 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 724 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 719 ) | 725 ) |
| 720 | 726 |
| 721 # ------------------------------------------------------------------------- | 727 # ------------------------------------------------------------------------- |
| OLD | NEW |