Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: build/SConscript.main

Issue 17021: Revert sdk 6.1 upgrade changes. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/internal/essential.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 if sys.platform == 'win32': 10 if sys.platform == 'win32':
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 msvs_drive = msvs_env['PATH'][0] 262 msvs_drive = msvs_env['PATH'][0]
263 else: 263 else:
264 msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''} 264 msvs_env = {'PATH': '', 'INCLUDE': '', 'LIB': ''}
265 msvs_drive = 'C' 265 msvs_drive = 'C'
266 266
267 # Use the absolute path for MSVC because it might not be on the same drive 267 # Use the absolute path for MSVC because it might not be on the same drive
268 # as our source checkout. 268 # as our source checkout.
269 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8' 269 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8'
270 270
271 # If side-by-side platform sdk is not available try local copy. 271 # If side-by-side platform sdk is not available try local copy.
272 platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/files' 272 platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files'
273 if (root_env['PLATFORM'] in ['win32', 'cygwin'] and 273 if (root_env['PLATFORM'] in ['win32', 'cygwin'] and
274 not os.path.exists(windows_env.subst(platform_sdk_path))): 274 not os.path.exists(windows_env.subst(platform_sdk_path))):
275 platform_sdk_path = ( 275 platform_sdk_path = (
276 msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1') 276 msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0')
277 277
278 windows_env.Replace( 278 windows_env.Replace(
279 CSCRIPT = 'c:\\Windows\\System32\\cscript', 279 CSCRIPT = 'c:\\Windows\\System32\\cscript',
280 280
281 PLATFORMSDK_6_1 = platform_sdk_path, 281 PLATFORMSDK_VISTA = platform_sdk_path,
282 VISUAL_STUDIO = visual_studio_path, 282 VISUAL_STUDIO = visual_studio_path,
283 283
284 CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), 284 CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'),
285 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', 285 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin',
286 286
287 PERL = '$CYGWIN_BIN_DIR/perl.exe', 287 PERL = '$CYGWIN_BIN_DIR/perl.exe',
288 288
289 MSVS_ENV = msvs_env, 289 MSVS_ENV = msvs_env,
290 290
291 YACC = '$CYGWIN_BIN_DIR/bison.exe', 291 YACC = '$CYGWIN_BIN_DIR/bison.exe',
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 'all_libraries', 806 'all_libraries',
807 'all_languages', 807 'all_languages',
808 'all_programs', 808 'all_programs',
809 'all_test_programs', 809 'all_test_programs',
810 ], projects = [p], 810 ], projects = [p],
811 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 811 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
812 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 812 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
813 ) 813 )
814 814
815 # ------------------------------------------------------------------------- 815 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « no previous file | build/internal/essential.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698