| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 # here in the build/ directory with us), not relative to the | 44 # here in the build/ directory with us), not relative to the |
| 45 # the SConstruct directory from which SCons was launched. When | 45 # the SConstruct directory from which SCons was launched. When |
| 46 # we roll forward to a version of SCons that fixes this, we'll | 46 # we roll forward to a version of SCons that fixes this, we'll |
| 47 # need to revert to the $BUILD_TYPE definition of GOOGLEURL_DIR. | 47 # need to revert to the $BUILD_TYPE definition of GOOGLEURL_DIR. |
| 48 #GOOGLEURL_DIR = '#/$BUILD_TYPE/googleurl', | 48 #GOOGLEURL_DIR = '#/$BUILD_TYPE/googleurl', |
| 49 GOOGLEURL_DIR = '#/../build/googleurl', | 49 GOOGLEURL_DIR = '#/../build/googleurl', |
| 50 | 50 |
| 51 NET_DIR = '#/$BUILD_TYPE/net', | 51 NET_DIR = '#/$BUILD_TYPE/net', |
| 52 RLZ_DIR = '#/$BUILD_TYPE/rlz', | 52 RLZ_DIR = '#/$BUILD_TYPE/rlz', |
| 53 SANDBOX_DIR = '#/$BUILD_TYPE/sandbox', | 53 SANDBOX_DIR = '#/$BUILD_TYPE/sandbox', |
| 54 SDCH_DIR = '#/$BUILD_TYPE/sdch', |
| 54 SKIA_DIR = '#/$BUILD_TYPE/skia', | 55 SKIA_DIR = '#/$BUILD_TYPE/skia', |
| 55 TESTING_DIR = '#/$BUILD_TYPE/testing', | 56 TESTING_DIR = '#/$BUILD_TYPE/testing', |
| 56 THIRD_PARTY_DIR = '#/$BUILD_TYPE/third_party', | 57 THIRD_PARTY_DIR = '#/$BUILD_TYPE/third_party', |
| 57 V8_DIR = '#/$BUILD_TYPE/v8', | 58 V8_DIR = '#/$BUILD_TYPE/v8', |
| 58 WEBKIT_DIR = '#/$BUILD_TYPE/webkit', | 59 WEBKIT_DIR = '#/$BUILD_TYPE/webkit', |
| 59 | 60 |
| 60 GTEST_DIR = '$TESTING_DIR/gtest', | 61 GTEST_DIR = '$TESTING_DIR/gtest', |
| 61 | 62 |
| 62 BSDIFF_DIR = '$THIRD_PARTY_DIR/bsdiff', | 63 BSDIFF_DIR = '$THIRD_PARTY_DIR/bsdiff', |
| 63 BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch', | 64 BSPATCH_DIR = '$THIRD_PARTY_DIR/bspatch', |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 | 472 |
| 472 if LoadComponent('net'): | 473 if LoadComponent('net'): |
| 473 sconscripts.append('$NET_DIR/SConscript') | 474 sconscripts.append('$NET_DIR/SConscript') |
| 474 | 475 |
| 475 if LoadComponent('rlz'): | 476 if LoadComponent('rlz'): |
| 476 sconscripts.append('$RLZ_DIR/SConscript') | 477 sconscripts.append('$RLZ_DIR/SConscript') |
| 477 | 478 |
| 478 if LoadComponent('sandbox'): | 479 if LoadComponent('sandbox'): |
| 479 sconscripts.append('$SANDBOX_DIR/src/SConscript') | 480 sconscripts.append('$SANDBOX_DIR/src/SConscript') |
| 480 | 481 |
| 482 if LoadComponent('sdch'): |
| 483 sconscripts.append('$SDCH_DIR/SConscript') |
| 484 |
| 481 if LoadComponent('skia'): | 485 if LoadComponent('skia'): |
| 482 sconscripts.append('$SKIA_DIR/SConscript') | 486 sconscripts.append('$SKIA_DIR/SConscript') |
| 483 | 487 |
| 484 if LoadComponent('testing'): | 488 if LoadComponent('testing'): |
| 485 sconscripts.append('$TESTING_DIR/SConscript.gtest') | 489 sconscripts.append('$TESTING_DIR/SConscript.gtest') |
| 486 | 490 |
| 487 if LoadComponent('third_party'): | 491 if LoadComponent('third_party'): |
| 488 sconscripts.extend([ | 492 sconscripts.extend([ |
| 489 '$BSDIFF_DIR/SConscript', | 493 '$BSDIFF_DIR/SConscript', |
| 490 '$BZIP2_DIR/SConscript', | 494 '$BZIP2_DIR/SConscript', |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 initial_indent = ' '*32, | 548 initial_indent = ' '*32, |
| 545 subsequent_indent = ' '*32, | 549 subsequent_indent = ' '*32, |
| 546 ) | 550 ) |
| 547 components = tw.fill(', '.join(components)) | 551 components = tw.fill(', '.join(components)) |
| 548 | 552 |
| 549 Help(help_fmt % components) | 553 Help(help_fmt % components) |
| 550 | 554 |
| 551 | 555 |
| 552 Import('build_component') | 556 Import('build_component') |
| 553 Default(build_component) | 557 Default(build_component) |
| OLD | NEW |