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 p = ARGUMENTS.get('PROGRESS') | 10 p = ARGUMENTS.get('PROGRESS') |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 'PERL_INCLUDE_SUFFIX,' | 337 'PERL_INCLUDE_SUFFIX,' |
338 '__env__, RDirs, TARGET, SOURCE)}'), | 338 '__env__, RDirs, TARGET, SOURCE)}'), |
339 | 339 |
340 ICU_LIBS = ['icu'], | 340 ICU_LIBS = ['icu'], |
341 ) | 341 ) |
342 # Build with support for gcov when COVERAGE=1. | 342 # Build with support for gcov when COVERAGE=1. |
343 if ARGUMENTS.get('COVERAGE') == '1': | 343 if ARGUMENTS.get('COVERAGE') == '1': |
344 env.Append(CCFLAGS=['-fprofile-arcs', '-ftest-coverage']) | 344 env.Append(CCFLAGS=['-fprofile-arcs', '-ftest-coverage']) |
345 env.Append(LINKFLAGS=['-fprofile-arcs']) | 345 env.Append(LINKFLAGS=['-fprofile-arcs']) |
346 | 346 |
347 # Build with system-provided NSS | 347 # Build with system-provided NSS and GLib |
348 env.ParseConfig('pkg-config --cflags --libs nss') | 348 env.ParseConfig('pkg-config --cflags --libs nss') |
| 349 env.ParseConfig('pkg-config --cflags --libs glib-2.0') |
349 | 350 |
350 elif env['PLATFORM'] == 'darwin': | 351 elif env['PLATFORM'] == 'darwin': |
351 | 352 |
352 # For now, mac only loads the components we know work on Mac, by default. | 353 # For now, mac only loads the components we know work on Mac, by default. |
353 load = [ | 354 load = [ |
354 'base', | 355 'base', |
355 #'breakpad', | 356 #'breakpad', |
356 'googleurl', | 357 'googleurl', |
357 'net', | 358 'net', |
358 'sdch', | 359 'sdch', |
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 initial_indent = ' '*32, | 562 initial_indent = ' '*32, |
562 subsequent_indent = ' '*32, | 563 subsequent_indent = ' '*32, |
563 ) | 564 ) |
564 components = tw.fill(', '.join(components)) | 565 components = tw.fill(', '.join(components)) |
565 | 566 |
566 Help(help_fmt % components) | 567 Help(help_fmt % components) |
567 | 568 |
568 | 569 |
569 Import('build_component') | 570 Import('build_component') |
570 Default(build_component) | 571 Default(build_component) |
OLD | NEW |