| 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('env') | 5 Import('env') |
| 6 | 6 |
| 7 # Grab the -j flag from the outer environment, if available. | 7 # Grab the -j flag from the outer environment, if available. |
| 8 try: | 8 try: |
| 9 cpus = env.GetOption('num_jobs') | 9 cpus = env.GetOption('num_jobs') |
| 10 cpu_flag = ' -j%d' % cpus | 10 cpu_flag = ' -j%d' % cpus |
| 11 except AttributeError: | 11 except AttributeError: |
| 12 cpu_flag = '' | 12 cpu_flag = '' |
| 13 | 13 |
| 14 env = env.Clone( | 14 env = env.Clone( |
| 15 V8_MODE = 'release', | 15 V8_MODE = 'release', |
| 16 V8_SRC_DIR = '#/../v8', | 16 V8_SRC_DIR = '$CHROME_SRC_DIR/v8', |
| 17 V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE', | 17 V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE', |
| 18 V8_SCONS_COM = 'cd ../v8 && $PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', | 18 V8_SCONS_COM = 'cd ../v8 && $PYTHON $SCONS $SCONSFLAGS mode=$V8_MODE', |
| 19 SCONS='../third_party/scons/scons.py', | 19 SCONS='../third_party/scons/scons.py', |
| 20 SCONSFLAGS = ('-Q ' | 20 SCONSFLAGS = ('-Q ' |
| 21 '--warn=no-deprecated ' | 21 '--warn=no-deprecated ' |
| 22 '--warn=no-no-parallel-support' + cpu_flag), | 22 '--warn=no-no-parallel-support' + cpu_flag), |
| 23 ) | 23 ) |
| 24 | 24 |
| 25 # Rather than build v8 with our own commands, we just shell out to v8's | 25 # Rather than build v8 with our own commands, we just shell out to v8's |
| 26 # own SCons-based build, since their build system is complicated. | 26 # own SCons-based build, since their build system is complicated. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 42 v8_lib, | 42 v8_lib, |
| 43 ] | 43 ] |
| 44 | 44 |
| 45 v8_scons_targets_on = [ | 45 v8_scons_targets_on = [ |
| 46 libraries_empty_obj, | 46 libraries_empty_obj, |
| 47 snapshot_obj, | 47 snapshot_obj, |
| 48 ] | 48 ] |
| 49 | 49 |
| 50 if env['PLATFORM'] == 'win32': | 50 if env['PLATFORM'] == 'win32': |
| 51 v8_scons_targets_off.extend([ | 51 v8_scons_targets_off.extend([ |
| 52 env.File('#/../v8/vc80.pdb') | 52 env.File('$CHROME_SRC_DIR/v8/vc80.pdb') |
| 53 ]) | 53 ]) |
| 54 | 54 |
| 55 v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, | 55 v8 = env.Command(v8_scons_targets_off + v8_scons_targets_on, |
| 56 [], | 56 [], |
| 57 ['$V8_SCONS_COM snapshot=off sample=shell', | 57 ['$V8_SCONS_COM snapshot=off sample=shell', |
| 58 '$V8_SCONS_COM snapshot=on ${TARGETS[-%d:]}' | 58 '$V8_SCONS_COM snapshot=on ${TARGETS[-%d:]}' |
| 59 % len(v8_scons_targets_on)]) | 59 % len(v8_scons_targets_on)]) |
| 60 env.AlwaysBuild(v8) | 60 env.AlwaysBuild(v8) |
| 61 | 61 |
| 62 # Tell our SCons invocation to *not* delete v8.lib and the other targets | 62 # Tell our SCons invocation to *not* delete v8.lib and the other targets |
| (...skipping 11 matching lines...) Expand all Loading... |
| 74 env.Alias('chrome', i) | 74 env.Alias('chrome', i) |
| 75 | 75 |
| 76 # To satisfy tests expecting the following .exe name. | 76 # To satisfy tests expecting the following .exe name. |
| 77 if env['PLATFORM'] == 'win32': | 77 if env['PLATFORM'] == 'win32': |
| 78 # TODO(evanm): this may be necessary on other platforms(?) | 78 # TODO(evanm): this may be necessary on other platforms(?) |
| 79 i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) | 79 i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) |
| 80 env.Alias('chrome', i) | 80 env.Alias('chrome', i) |
| 81 | 81 |
| 82 env.ChromeStaticLibrary('v8_snapshot', | 82 env.ChromeStaticLibrary('v8_snapshot', |
| 83 [libraries_empty_obj, snapshot_obj]) | 83 [libraries_empty_obj, snapshot_obj]) |
| OLD | NEW |