| 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 | 6 |
| 7 Import(['env']) | 7 Import(['env']) |
| 8 | 8 |
| 9 env_res = env.Clone() | 9 env_res = env.Clone() |
| 10 env_test = env.Clone() | 10 env_test = env.Clone() |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 'browser/security/resources/ssl_roadblock.html', '$FLATTEN_HTML_COM') | 407 'browser/security/resources/ssl_roadblock.html', '$FLATTEN_HTML_COM') |
| 408 | 408 |
| 409 env_flat.Depends(browser_res, flats_out) | 409 env_flat.Depends(browser_res, flats_out) |
| 410 | 410 |
| 411 | 411 |
| 412 # TODO(port) | 412 # TODO(port) |
| 413 env_test.Object('test/test_file_util.cc', | 413 env_test.Object('test/test_file_util.cc', |
| 414 CPPPATH=['..'] + env['CPPPATH']) | 414 CPPPATH=['..'] + env['CPPPATH']) |
| 415 | 415 |
| 416 test_sconscript_files = [ | 416 test_sconscript_files = [ |
| 417 'SConscript.automated_ui_tests', | |
| 418 'SConscript.unit_tests', | 417 'SConscript.unit_tests', |
| 419 'SConscript.ui_tests', | |
| 420 ] | 418 ] |
| 421 | 419 |
| 422 # TODO(port) | 420 # TODO(port) |
| 423 if env['PLATFORM'] == 'win32': | 421 if env['PLATFORM'] == 'win32': |
| 424 env.SConscript(test_sconscript_files, exports=['env_test']) | 422 test_sconscript_files.extend([ |
| 423 'SConscript.automated_ui_tests', |
| 424 'SConscript.ui_tests', |
| 425 ]) |
| 425 | 426 |
| 427 env.SConscript(test_sconscript_files, exports=['env_test']) |
| 426 | 428 |
| 427 sconscript_files = [ | 429 sconscript_files = [ |
| 428 '$THIRD_PARTY_DIR/sqlite/SConscript', | 430 '$THIRD_PARTY_DIR/sqlite/SConscript', |
| 429 ] | 431 ] |
| 430 | 432 |
| 431 # TODO(port) | 433 # TODO(port) |
| 432 if env['PLATFORM'] == 'win32': | 434 if env['PLATFORM'] == 'win32': |
| 433 sconscript_files.extend([ | 435 sconscript_files.extend([ |
| 434 'app/resources/SConscript', | 436 'app/resources/SConscript', |
| 435 'app/theme/SConscript', | 437 'app/theme/SConscript', |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 env.Alias('chrome', i) | 485 env.Alias('chrome', i) |
| 484 | 486 |
| 485 | 487 |
| 486 i = env.Command('$TARGET_ROOT/resources/inspector', | 488 i = env.Command('$TARGET_ROOT/resources/inspector', |
| 487 '#/../webkit/port/page/inspector', | 489 '#/../webkit/port/page/inspector', |
| 488 Copy('$TARGET', '$SOURCE'), | 490 Copy('$TARGET', '$SOURCE'), |
| 489 source_scanner=DirScanner) | 491 source_scanner=DirScanner) |
| 490 env.Alias('chrome', i) | 492 env.Alias('chrome', i) |
| 491 | 493 |
| 492 env.Alias('chrome', env.Alias('webkit')) | 494 env.Alias('chrome', env.Alias('webkit')) |
| OLD | NEW |