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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 # Build shared libraries (useful for fast links) when SHARED=1. | 590 # Build shared libraries (useful for fast links) when SHARED=1. |
591 if ARGUMENTS.get('SHARED') == '1': | 591 if ARGUMENTS.get('SHARED') == '1': |
592 linux_env.Replace(COMPONENT_STATIC=False) | 592 linux_env.Replace(COMPONENT_STATIC=False) |
593 | 593 |
594 # Build with system-provided NSS and GTK. | 594 # Build with system-provided NSS and GTK. |
595 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: | 595 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: |
596 try: | 596 try: |
597 linux_env.ParseConfig('pkg-config --cflags --libs nss') | 597 linux_env.ParseConfig('pkg-config --cflags --libs nss') |
598 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') | 598 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') |
599 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') | 599 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') |
| 600 linux_env.ParseConfig('pkg-config --cflags --libs gconf-2.0') |
600 except OSError, e: | 601 except OSError, e: |
601 print ('\n' | 602 print ('\n' |
602 'Failed to find a package dependency. Please install all the\n' | 603 'Failed to find a package dependency. Please install all the\n' |
603 'packages listed at\n' | 604 'packages listed at\n' |
604 'http://code.google.com/p/chromium/wiki/LinuxBuildInstructions' | 605 'http://code.google.com/p/chromium/wiki/LinuxBuildInstructions' |
605 '#Software_Requirements') | 606 '#Software_Requirements') |
606 | 607 |
607 sys.exit(1) | 608 sys.exit(1) |
608 | 609 |
609 # TODO: Factor the code here into aits own function. | 610 # TODO: Factor the code here into aits own function. |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
891 'all_libraries', | 892 'all_libraries', |
892 'all_languages', | 893 'all_languages', |
893 'all_programs', | 894 'all_programs', |
894 'all_test_programs', | 895 'all_test_programs', |
895 ], projects = [p], | 896 ], projects = [p], |
896 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 897 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
897 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 898 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
898 ) | 899 ) |
899 | 900 |
900 # ------------------------------------------------------------------------- | 901 # ------------------------------------------------------------------------- |
OLD | NEW |