Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Side by Side Diff: build/SConscript.main

Issue 19041: Allow "hammer Hammer SHARED=1" to build cleanly. (Closed)
Patch Set: remove media Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/SConscript.v8 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 linux_env.Append(LINKFLAGS=['-pg']) 533 linux_env.Append(LINKFLAGS=['-pg'])
534 534
535 # Build with symbols (useful for opt builds, for example) when SYMBOLS=1. 535 # Build with symbols (useful for opt builds, for example) when SYMBOLS=1.
536 if ARGUMENTS.get('SYMBOLS') == '1': 536 if ARGUMENTS.get('SYMBOLS') == '1':
537 linux_env.Append(CCFLAGS=['-g']) 537 linux_env.Append(CCFLAGS=['-g'])
538 538
539 # Build shared libraries (useful for fast links) when SHARED=1. 539 # Build shared libraries (useful for fast links) when SHARED=1.
540 if ARGUMENTS.get('SHARED') == '1': 540 if ARGUMENTS.get('SHARED') == '1':
541 linux_env.Replace(COMPONENT_STATIC=False) 541 linux_env.Replace(COMPONENT_STATIC=False)
542 542
543 # The shared library build only works for test_shell and test_shell_tests,
544 # so filter out Chrome.
545 print "Filtering out chrome and media build targets in shared object build."
546 linux_env.FilterOut(
547 BUILD_SCONSCRIPTS = [
548 '$CHROME_DIR/chrome.scons',
549 '$MEDIA_DIR/media.scons',
550 ]
551 )
552
543 # Build with system-provided NSS and GTK. 553 # Build with system-provided NSS and GTK.
544 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: 554 if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']:
545 try: 555 try:
546 linux_env.ParseConfig('pkg-config --cflags --libs nss') 556 linux_env.ParseConfig('pkg-config --cflags --libs nss')
547 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') 557 linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
548 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2') 558 linux_env.ParseConfig('pkg-config --cflags --libs pangoft2')
549 except OSError, e: 559 except OSError, e:
550 print ('\n' 560 print ('\n'
551 'Failed to find a package dependency. Please install all the\n' 561 'Failed to find a package dependency. Please install all the\n'
552 'packages listed at\n' 562 'packages listed at\n'
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 'all_libraries', 839 'all_libraries',
830 'all_languages', 840 'all_languages',
831 'all_programs', 841 'all_programs',
832 'all_test_programs', 842 'all_test_programs',
833 ], projects = [p], 843 ], projects = [p],
834 COMPONENT_VS_PROJECT_SCRIPT_PATH=( 844 COMPONENT_VS_PROJECT_SCRIPT_PATH=(
835 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), 845 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'),
836 ) 846 )
837 847
838 # ------------------------------------------------------------------------- 848 # -------------------------------------------------------------------------
OLDNEW
« no previous file with comments | « no previous file | build/SConscript.v8 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698