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

Side by Side Diff: chrome/browser/browser.scons

Issue 42306: Make startup_tests build and work on Mac. (Closed)
Patch Set: add app dependency Created 11 years, 9 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
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('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.SConscript([ 9 env.SConscript([
10 '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', 10 '$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 'window_sizer.cc', 211 'window_sizer.cc',
212 'window_sizer.h', 212 'window_sizer.h',
213 ]), 213 ]),
214 MSVSFilter('Automation', [ 214 MSVSFilter('Automation', [
215 'automation/automation_autocomplete_edit_tracker.h', 215 'automation/automation_autocomplete_edit_tracker.h',
216 'automation/automation_browser_tracker.h', 216 'automation/automation_browser_tracker.h',
217 'automation/automation_constrained_window_tracker.h', 217 'automation/automation_constrained_window_tracker.h',
218 'automation/automation_provider.cc', 218 'automation/automation_provider.cc',
219 'automation/automation_provider.h', 219 'automation/automation_provider.h',
220 'automation/automation_provider_list.cc', 220 'automation/automation_provider_list.cc',
221 'automation/automation_provider_list_generic.cc',
222 'automation/automation_provider_list_mac.mm',
221 'automation/automation_provider_list.h', 223 'automation/automation_provider_list.h',
222 'automation/automation_resource_tracker.cc', 224 'automation/automation_resource_tracker.cc',
223 'automation/automation_resource_tracker.h', 225 'automation/automation_resource_tracker.h',
224 'automation/automation_tab_tracker.h', 226 'automation/automation_tab_tracker.h',
225 'automation/automation_window_tracker.h', 227 'automation/automation_window_tracker.h',
226 'automation/ui_controls.cc', 228 'automation/ui_controls.cc',
227 'automation/ui_controls.h', 229 'automation/ui_controls.h',
228 'automation/url_request_failed_dns_job.cc', 230 'automation/url_request_failed_dns_job.cc',
229 'automation/url_request_failed_dns_job.h', 231 'automation/url_request_failed_dns_job.h',
230 'automation/url_request_mock_http_job.cc', 232 'automation/url_request_mock_http_job.cc',
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 'tab_contents/web_contents_view_gtk.cc', 773 'tab_contents/web_contents_view_gtk.cc',
772 'tab_contents/render_view_context_menu_gtk.cc', 774 'tab_contents/render_view_context_menu_gtk.cc',
773 ]) 775 ])
774 776
775 if env.Bit('mac'): 777 if env.Bit('mac'):
776 input_files.Remove( 778 input_files.Remove(
777 'spellchecker.cc', 779 'spellchecker.cc',
778 'tab_contents/web_contents_view.cc', 780 'tab_contents/web_contents_view.cc',
779 ) 781 )
780 782
783 if not env.Bit('mac'):
784 # Mac-specific files
785 input_files.Remove(
786 'automation/automation_provider_list_mac.mm',
787 )
788
781 if env.Bit('windows'): 789 if env.Bit('windows'):
782 env.TypeLibrary('history/history_indexer.idl') 790 env.TypeLibrary('history/history_indexer.idl')
783 791
784 input_files.Remove( 792 input_files.Remove(
785 'history/history_publisher_none.cc', 793 'history/history_publisher_none.cc',
786 'importer/firefox_profile_lock_posix.cc', 794 'importer/firefox_profile_lock_posix.cc',
787 ) 795 )
788 796
789 if not env.Bit('mac'): 797 if not env.Bit('mac'):
790 # TODO: This should work for all platforms. 798 # TODO: This should work for all platforms.
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 891
884 xmldoc_tool_list = [ 892 xmldoc_tool_list = [
885 MSVSTool('VCCLCompilerTool', 893 MSVSTool('VCCLCompilerTool',
886 XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'), 894 XMLDocumentationFileName=('$(IntDir)/$(InputName)1.xdc'),
887 ObjectFile='$(IntDir)/$(InputName)1.obj'), 895 ObjectFile='$(IntDir)/$(InputName)1.obj'),
888 ] 896 ]
889 897
890 for filename in xmldoc_files: 898 for filename in xmldoc_files:
891 p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list) 899 p.AddFileConfig(filename, 'Debug|Win32', xmldoc_tool_list)
892 p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list) 900 p.AddFileConfig(filename, 'Release|Win32', xmldoc_tool_list)
OLDNEW
« no previous file with comments | « chrome/browser/automation/automation_provider_list_mac.mm ('k') | chrome/browser/browser.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698