| 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 linux_env.Append(LINKFLAGS=['-pg']) | 532 linux_env.Append(LINKFLAGS=['-pg']) |
| 533 | 533 |
| 534 # Build with symbols (useful for opt builds, for example) when SYMBOLS=1. | 534 # Build with symbols (useful for opt builds, for example) when SYMBOLS=1. |
| 535 if ARGUMENTS.get('SYMBOLS') == '1': | 535 if ARGUMENTS.get('SYMBOLS') == '1': |
| 536 linux_env.Append(CCFLAGS=['-g']) | 536 linux_env.Append(CCFLAGS=['-g']) |
| 537 | 537 |
| 538 # Build shared libraries (useful for fast links) when SHARED=1. | 538 # Build shared libraries (useful for fast links) when SHARED=1. |
| 539 if ARGUMENTS.get('SHARED') == '1': | 539 if ARGUMENTS.get('SHARED') == '1': |
| 540 linux_env.Replace(COMPONENT_STATIC=False) | 540 linux_env.Replace(COMPONENT_STATIC=False) |
| 541 | 541 |
| 542 # The shared library build only works for test_shell and test_shell_tests, | |
| 543 # so filter out Chrome. | |
| 544 print "Filtering out chrome and media build targets in shared object build." | |
| 545 linux_env.FilterOut( | |
| 546 BUILD_SCONSCRIPTS = [ | |
| 547 '$CHROME_DIR/chrome.scons', | |
| 548 ] | |
| 549 ) | |
| 550 | |
| 551 # Build with system-provided NSS and GTK. | 542 # Build with system-provided NSS and GTK. |
| 552 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: | 543 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: |
| 553 try: | 544 try: |
| 554 linux_env.ParseConfig('pkg-config --cflags --libs nss') | 545 linux_env.ParseConfig('pkg-config --cflags --libs nss') |
| 555 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') | 546 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') |
| 556 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') | 547 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') |
| 557 except OSError, e: | 548 except OSError, e: |
| 558 print ('\n' | 549 print ('\n' |
| 559 'Failed to find a package dependency. Please install all the\n' | 550 'Failed to find a package dependency. Please install all the\n' |
| 560 'packages listed at\n' | 551 'packages listed at\n' |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 846 'all_libraries', | 837 'all_libraries', |
| 847 'all_languages', | 838 'all_languages', |
| 848 'all_programs', | 839 'all_programs', |
| 849 'all_test_programs', | 840 'all_test_programs', |
| 850 ], projects = [p], | 841 ], projects = [p], |
| 851 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 842 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 852 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 843 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 853 ) | 844 ) |
| 854 | 845 |
| 855 # ------------------------------------------------------------------------- | 846 # ------------------------------------------------------------------------- |
| OLD | NEW |