| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 102 |
| 103 def ChromeObject(env, *args, **kw): | 103 def ChromeObject(env, *args, **kw): |
| 104 return env.ComponentObject(*args, **kw) | 104 return env.ComponentObject(*args, **kw) |
| 105 env.AddMethod(ChromeObject) | 105 env.AddMethod(ChromeObject) |
| 106 | 106 |
| 107 | 107 |
| 108 | 108 |
| 109 if env['PLATFORM'] == 'win32': | 109 if env['PLATFORM'] == 'win32': |
| 110 env.Tool('target_platform_windows') | 110 env.Tool('target_platform_windows') |
| 111 env.Tool('target_debug') | 111 env.Tool('target_debug') |
| 112 env.Tool('midl') |
| 113 |
| 114 # TODO(bradnelson): this is needed for now because target_platform_windows |
| 115 # has OS_WINDOWS defined in a weird way. |
| 116 env.FilterOut(CPPDEFINES = ['OS_WINDOWS=OS_WINDOWS']) |
| 117 |
| 118 env['PDB'] = '${TARGET.base}.pdb' |
| 112 | 119 |
| 113 processors = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) | 120 processors = int(os.environ.get('NUMBER_OF_PROCESSORS', 1)) |
| 114 SetOption('num_jobs', processors + 1) | 121 SetOption('num_jobs', processors + 1) |
| 115 | 122 |
| 116 msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] | 123 msvs_env = Environment(tools=['msvc', 'mslink', 'msvs'])['ENV'] |
| 117 | 124 |
| 118 # Use the absolute path for MSVC because it might not be on the same drive | 125 # Use the absolute path for MSVC because it might not be on the same drive |
| 119 # as our source checkout. | 126 # as our source checkout. |
| 120 visual_studio_path = (msvs_env['PATH'][0] + | 127 visual_studio_path = (msvs_env['PATH'][0] + |
| 121 ':/Program Files/Microsoft Visual Studio 8') | 128 ':/Program Files/Microsoft Visual Studio 8') |
| 122 | 129 |
| 123 env.Replace( | 130 env.Replace( |
| 124 CSCRIPT = 'c:\\Windows\\System32\\cscript', | 131 CSCRIPT = 'c:\\Windows\\System32\\cscript', |
| 125 | 132 |
| 126 PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', | 133 PLATFORMSDK_VISTA_REL = '../third_party/platformsdk_vista_6_0', |
| 127 PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/$PLATFORMSDK_VISTA_REL', | 134 PLATFORMSDK_VISTA = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0', |
| 128 VISUAL_STUDIO = visual_studio_path, | 135 VISUAL_STUDIO = visual_studio_path, |
| 129 | 136 |
| 130 CYGWIN_DIR = env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), | 137 CYGWIN_DIR = env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), |
| 131 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', | 138 CYGWIN_BIN_DIR = '$CYGWIN_DIR/bin', |
| 132 | 139 |
| 133 PERL = '$CYGWIN_BIN_DIR/perl.exe', | 140 PERL = '$CYGWIN_BIN_DIR/perl.exe', |
| 134 | 141 |
| 135 MSVS_ENV = msvs_env, | 142 MSVS_ENV = msvs_env, |
| 136 | 143 |
| 137 YACC = '$CYGWIN_BIN_DIR/bison.exe', | 144 YACC = '$CYGWIN_BIN_DIR/bison.exe', |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 initial_indent = ' '*32, | 560 initial_indent = ' '*32, |
| 554 subsequent_indent = ' '*32, | 561 subsequent_indent = ' '*32, |
| 555 ) | 562 ) |
| 556 components = tw.fill(', '.join(components)) | 563 components = tw.fill(', '.join(components)) |
| 557 | 564 |
| 558 Help(help_fmt % components) | 565 Help(help_fmt % components) |
| 559 | 566 |
| 560 | 567 |
| 561 Import('build_component') | 568 Import('build_component') |
| 562 Default(build_component) | 569 Default(build_component) |
| OLD | NEW |