| 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 if sys.platform == 'win32': | 10 if sys.platform == 'win32': |
| (...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 445 _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' | 445 _PERL_INCLUDE_FLAGS = ('${_concat(PERL_INCLUDE_FLAG, ' |
| 446 'PERL_INCLUDE_PATH, ' | 446 'PERL_INCLUDE_PATH, ' |
| 447 'PERL_INCLUDE_SUFFIX,' | 447 'PERL_INCLUDE_SUFFIX,' |
| 448 '__env__, RDirs, TARGET, SOURCE)}'), | 448 '__env__, RDirs, TARGET, SOURCE)}'), |
| 449 ) | 449 ) |
| 450 | 450 |
| 451 linux_env.FilterOut( | 451 linux_env.FilterOut( |
| 452 BUILD_SCONSCRIPTS = [ | 452 BUILD_SCONSCRIPTS = [ |
| 453 '$BSPATCH_DIR/bspatch.scons', | 453 '$BSPATCH_DIR/bspatch.scons', |
| 454 '$BSDIFF_DIR/bsdiff.scons', | 454 '$BSDIFF_DIR/bsdiff.scons', |
| 455 '$GEARS_DIR/SConscript', | |
| 456 '$GOOGLE_UPDATE_DIR/SConscript', | 455 '$GOOGLE_UPDATE_DIR/SConscript', |
| 457 '$RLZ_DIR/SConscript', | 456 '$RLZ_DIR/SConscript', |
| 458 '$SANDBOX_DIR/sandbox.scons', | 457 '$SANDBOX_DIR/sandbox.scons', |
| 459 ], | 458 ], |
| 460 ) | 459 ) |
| 461 | 460 |
| 462 linux_env.Append( | 461 linux_env.Append( |
| 463 # We need rt for clock_gettime. | 462 # We need rt for clock_gettime. |
| 464 LIBS = ['rt'], | 463 LIBS = ['rt'], |
| 465 | 464 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 CXX = 'g++-4.2', | 540 CXX = 'g++-4.2', |
| 542 LINK = '$CXX', | 541 LINK = '$CXX', |
| 543 ) | 542 ) |
| 544 | 543 |
| 545 mac_env.FilterOut( | 544 mac_env.FilterOut( |
| 546 BUILD_SCONSCRIPTS = [ | 545 BUILD_SCONSCRIPTS = [ |
| 547 '$BREAKPAD_DIR/SConscript', | 546 '$BREAKPAD_DIR/SConscript', |
| 548 '$BSDIFF_DIR/bsdiff.scons', | 547 '$BSDIFF_DIR/bsdiff.scons', |
| 549 '$BSPATCH_DIR/bspatch.scons', | 548 '$BSPATCH_DIR/bspatch.scons', |
| 550 '$CHROME_DIR/chrome.scons', | 549 '$CHROME_DIR/chrome.scons', |
| 551 '$GEARS_DIR/SConscript', | |
| 552 '$GOOGLE_UPDATE_DIR/SConscript', | 550 '$GOOGLE_UPDATE_DIR/SConscript', |
| 553 '$LIBJPEG_DIR/libjpeg.scons', | 551 '$LIBJPEG_DIR/libjpeg.scons', |
| 554 '$LIBXML_DIR/libxml.scons', | 552 '$LIBXML_DIR/libxml.scons', |
| 555 '$LIBXSLT_DIR/libxslt.scons', | 553 '$LIBXSLT_DIR/libxslt.scons', |
| 556 '$RLZ_DIR/SConscript', | 554 '$RLZ_DIR/SConscript', |
| 557 '$SANDBOX_DIR/sandbox.scons', | 555 '$SANDBOX_DIR/sandbox.scons', |
| 558 '$WEBKIT_DIR/SConscript', | 556 '$WEBKIT_DIR/SConscript', |
| 559 'build/SConscript.v8', | 557 'build/SConscript.v8', |
| 560 ], | 558 ], |
| 561 ) | 559 ) |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 'all_libraries', | 717 'all_libraries', |
| 720 'all_languages', | 718 'all_languages', |
| 721 'all_programs', | 719 'all_programs', |
| 722 'all_test_programs', | 720 'all_test_programs', |
| 723 ], projects = [p], | 721 ], projects = [p], |
| 724 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 722 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 725 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 723 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 726 ) | 724 ) |
| 727 | 725 |
| 728 # ------------------------------------------------------------------------- | 726 # ------------------------------------------------------------------------- |
| OLD | NEW |