| 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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 # Build shared libraries (useful for fast links) when SHARED=1. | 541 # Build shared libraries (useful for fast links) when SHARED=1. |
| 542 if ARGUMENTS.get('SHARED') == '1': | 542 if ARGUMENTS.get('SHARED') == '1': |
| 543 linux_env.Replace(COMPONENT_STATIC=False) | 543 linux_env.Replace(COMPONENT_STATIC=False) |
| 544 | 544 |
| 545 # The shared library build only works for test_shell and test_shell_tests, | 545 # The shared library build only works for test_shell and test_shell_tests, |
| 546 # so filter out Chrome. | 546 # so filter out Chrome. |
| 547 print "Filtering out chrome and media build targets in shared object build." | 547 print "Filtering out chrome and media build targets in shared object build." |
| 548 linux_env.FilterOut( | 548 linux_env.FilterOut( |
| 549 BUILD_SCONSCRIPTS = [ | 549 BUILD_SCONSCRIPTS = [ |
| 550 '$CHROME_DIR/chrome.scons', | 550 '$CHROME_DIR/chrome.scons', |
| 551 '$MEDIA_DIR/media.scons', | |
| 552 ] | 551 ] |
| 553 ) | 552 ) |
| 554 | 553 |
| 555 # Build with system-provided NSS and GTK. | 554 # Build with system-provided NSS and GTK. |
| 556 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: | 555 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: |
| 557 try: | 556 try: |
| 558 linux_env.ParseConfig('pkg-config --cflags --libs nss') | 557 linux_env.ParseConfig('pkg-config --cflags --libs nss') |
| 559 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') | 558 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') |
| 560 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') | 559 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') |
| 561 except OSError, e: | 560 except OSError, e: |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 'all_libraries', | 849 'all_libraries', |
| 851 'all_languages', | 850 'all_languages', |
| 852 'all_programs', | 851 'all_programs', |
| 853 'all_test_programs', | 852 'all_test_programs', |
| 854 ], projects = [p], | 853 ], projects = [p], |
| 855 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 854 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 856 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 855 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 857 ) | 856 ) |
| 858 | 857 |
| 859 # ------------------------------------------------------------------------- | 858 # ------------------------------------------------------------------------- |
| OLD | NEW |