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

Side by Side Diff: gears/SConscript.inputs

Issue 16586: Update Gears to r3147, and fix scons build to match. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « gears/SConscript.googleurl ('k') | gears/SConscript.portaudio » ('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) 2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 types = ['CPPSRCS', 'M4SRCS', 'HTML_M4SRCS', 'I18N_M4SRCS', 'STABSRCS', 7 types = ['CPPSRCS', 'M4SRCS', 'HTML_M4SRCS', 'I18N_M4SRCS', 'STABSRCS',
8 'IDLSRCS', 'RESSRCS', 'LINKSRCS', 'SHLINKSRCS'] 8 'IDLSRCS', 'RESSRCS', 'LINKSRCS', 'SHLINKSRCS']
9 9
10 # Set up aliases for shared inputs. 10 # Set up aliases for shared inputs.
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 if env['OS'] == 'win32': 513 if env['OS'] == 'win32':
514 env.Append(NPAPI_CPPSRCS = [ 514 env.Append(NPAPI_CPPSRCS = [
515 '$OPEN_DIR/desktop/desktop_cr.cc', 515 '$OPEN_DIR/desktop/desktop_cr.cc',
516 ]) 516 ])
517 517
518 env.Append(BROWSER_CPPSRCS = [ 518 env.Append(BROWSER_CPPSRCS = [
519 '$OPEN_DIR/desktop/file_dialog.cc', 519 '$OPEN_DIR/desktop/file_dialog.cc',
520 '$OPEN_DIR/desktop/file_dialog_gtk.cc', 520 '$OPEN_DIR/desktop/file_dialog_gtk.cc',
521 '$OPEN_DIR/desktop/file_dialog_osx.cc', 521 '$OPEN_DIR/desktop/file_dialog_osx.cc',
522 '$OPEN_DIR/desktop/file_dialog_win32.cc', 522 '$OPEN_DIR/desktop/file_dialog_win32.cc',
523 '$OPEN_DIR/desktop/file_dialog_android.cc',
523 ]) 524 ])
524 525
525 # The browser module also needs these files, to communicate with the notifier. 526 # The browser module also needs these files, to communicate with the notifier.
526 env.Append(BROWSER_CPPSRCS = [ 527 env.Append(BROWSER_CPPSRCS = [
527 '$OPEN_DIR/notifier/const_notifier.cc', 528 '$OPEN_DIR/notifier/const_notifier.cc',
528 '$OPEN_DIR/notifier/notifier_process_linux.cc', 529 '$OPEN_DIR/notifier/notifier_process_linux.cc',
529 '$OPEN_DIR/notifier/notifier_process_posix.cc', 530 '$OPEN_DIR/notifier/notifier_process_posix.cc',
530 '$OPEN_DIR/notifier/notifier_process_win32.cc', 531 '$OPEN_DIR/notifier/notifier_process_win32.cc',
531 '$OPEN_DIR/notifier/notifier_proxy.cc', 532 '$OPEN_DIR/notifier/notifier_proxy.cc',
532 '$OPEN_DIR/notifier/notifier_utils_win32.cc', 533 '$OPEN_DIR/notifier/notifier_utils_win32.cc',
533 '$OPEN_DIR/notifier/notification.cc', 534 '$OPEN_DIR/notifier/notification.cc',
534 ]) 535 ])
535 536
536 env.Append(FF3_CPPSRCS = [
537 '$OPEN_DIR/desktop/drag_and_drop_utils_ff.cc',
538 '$OPEN_DIR/desktop/drop_target_ff.cc',
539 ])
540
541 env.Append(IE_CPPSRCS = [
542 '$OPEN_DIR/desktop/drag_and_drop_utils_ie.cc',
543 '$OPEN_DIR/desktop/drop_target_ie.cc',
544 ])
545
546 if not env['OFFICIAL_BUILD']: 537 if not env['OFFICIAL_BUILD']:
547 # The Drag-and-Drop API has not been finalized for official builds. 538 # The Drag-and-Drop API has not been finalized for official builds.
539 env.Append(BROWSER_CPPSRCS = [
540 '$OPEN_DIR/desktop/drag_and_drop_utils_common.cc',
541 ])
542
543 env.Append(FF3_CPPSRCS = [
544 '$OPEN_DIR/desktop/drag_and_drop_utils_ff.cc',
545 '$OPEN_DIR/desktop/drop_target_ff.cc',
546 ])
547
548 env.Append(IE_CPPSRCS = [
549 '$OPEN_DIR/desktop/drag_and_drop_utils_ie.cc',
550 '$OPEN_DIR/desktop/drop_target_ie.cc',
551 ])
552
548 env.Append(SF_CPPSRCS = [ 553 env.Append(SF_CPPSRCS = [
549 '$OPEN_DIR/desktop/drag_and_drop_utils_sf.mm', 554 '$OPEN_DIR/desktop/drag_and_drop_utils_sf.mm',
550 '$OPEN_DIR/desktop/drop_target_sf.cc', 555 '$OPEN_DIR/desktop/drop_target_sf.cc',
551 ]) 556 ])
552 557
553 #----------------------------------------------------------------------------- 558 #-----------------------------------------------------------------------------
554 # localserver/common 559 # localserver/common
555 560
556 env.Append(BROWSER_CPPSRCS = [ 561 env.Append(BROWSER_CPPSRCS = [
557 '$OPEN_DIR/localserver/common/async_task_test.cc', 562 '$OPEN_DIR/localserver/common/async_task_test.cc',
558 '$OPEN_DIR/localserver/common/blob_store.cc', 563 '$OPEN_DIR/localserver/common/blob_store.cc',
559 '$OPEN_DIR/localserver/common/capture_task.cc', 564 '$OPEN_DIR/localserver/common/capture_task.cc',
560 '$OPEN_DIR/localserver/common/file_store.cc', 565 '$OPEN_DIR/localserver/common/file_store.cc',
561 '$OPEN_DIR/localserver/common/http_constants.cc', 566 '$OPEN_DIR/localserver/common/http_constants.cc',
562 '$OPEN_DIR/localserver/common/localserver.cc', 567 '$OPEN_DIR/localserver/common/localserver.cc',
563 '$OPEN_DIR/localserver/common/localserver_db.cc', 568 '$OPEN_DIR/localserver/common/localserver_db.cc',
564 '$OPEN_DIR/localserver/common/localserver_perf_test.cc', 569 '$OPEN_DIR/localserver/common/localserver_perf_test.cc',
565 '$OPEN_DIR/localserver/common/managed_resource_store.cc', 570 '$OPEN_DIR/localserver/common/managed_resource_store.cc',
566 '$OPEN_DIR/localserver/common/manifest.cc', 571 '$OPEN_DIR/localserver/common/manifest.cc',
572 '$OPEN_DIR/localserver/common/progress_event.cc',
567 '$OPEN_DIR/localserver/common/resource_store.cc', 573 '$OPEN_DIR/localserver/common/resource_store.cc',
568 '$OPEN_DIR/localserver/common/safe_http_request.cc', 574 '$OPEN_DIR/localserver/common/safe_http_request.cc',
569 '$OPEN_DIR/localserver/common/update_task.cc', 575 '$OPEN_DIR/localserver/common/update_task.cc',
570 '$OPEN_DIR/localserver/common/update_task_single_process.cc', 576 '$OPEN_DIR/localserver/common/update_task_single_process.cc',
571 '$OPEN_DIR/localserver/file_submitter.cc', 577 '$OPEN_DIR/localserver/file_submitter.cc',
572 '$OPEN_DIR/localserver/localserver_module.cc', 578 '$OPEN_DIR/localserver/localserver_module.cc',
573 '$OPEN_DIR/localserver/managed_resource_store_module.cc', 579 '$OPEN_DIR/localserver/managed_resource_store_module.cc',
574 '$OPEN_DIR/localserver/resource_store_module.cc', 580 '$OPEN_DIR/localserver/resource_store_module.cc',
575 ]) 581 ])
576 582
(...skipping 28 matching lines...) Expand all
605 #----------------------------------------------------------------------------- 611 #-----------------------------------------------------------------------------
606 # localserver/safari 612 # localserver/safari
607 613
608 env.Append(SF_CPPSRCS = [ 614 env.Append(SF_CPPSRCS = [
609 '$OPEN_DIR/localserver/safari/async_task_sf.mm', 615 '$OPEN_DIR/localserver/safari/async_task_sf.mm',
610 '$OPEN_DIR/localserver/safari/http_cookies_sf.mm', 616 '$OPEN_DIR/localserver/safari/http_cookies_sf.mm',
611 '$OPEN_DIR/localserver/safari/http_handler.mm', 617 '$OPEN_DIR/localserver/safari/http_handler.mm',
612 '$OPEN_DIR/localserver/safari/http_request_delegate.mm', 618 '$OPEN_DIR/localserver/safari/http_request_delegate.mm',
613 '$OPEN_DIR/localserver/safari/http_request_sf.mm', 619 '$OPEN_DIR/localserver/safari/http_request_sf.mm',
614 '$OPEN_DIR/localserver/safari/localserver_db_proxy.mm', 620 '$OPEN_DIR/localserver/safari/localserver_db_proxy.mm',
615 '$OPEN_DIR/localserver/common/progress_event.cc',
616 '$OPEN_DIR/localserver/safari/progress_input_stream.mm', 621 '$OPEN_DIR/localserver/safari/progress_input_stream.mm',
617 '$OPEN_DIR/localserver/safari/ui_thread.cc' 622 '$OPEN_DIR/localserver/safari/ui_thread.cc'
618 ]) 623 ])
619 624
620 #----------------------------------------------------------------------------- 625 #-----------------------------------------------------------------------------
621 # localserver/firefox 626 # localserver/firefox
622 627
623 env.Append(FF3_CPPSRCS = [ 628 env.Append(FF3_CPPSRCS = [
624 '$OPEN_DIR/localserver/common/progress_event.cc',
625 '$OPEN_DIR/localserver/firefox/async_task_ff.cc', 629 '$OPEN_DIR/localserver/firefox/async_task_ff.cc',
626 '$OPEN_DIR/localserver/firefox/cache_intercept.cc', 630 '$OPEN_DIR/localserver/firefox/cache_intercept.cc',
627 '$OPEN_DIR/localserver/firefox/http_request_ff.cc', 631 '$OPEN_DIR/localserver/firefox/http_request_ff.cc',
628 '$OPEN_DIR/localserver/firefox/progress_input_stream.cc', 632 '$OPEN_DIR/localserver/firefox/progress_input_stream.cc',
629 ]) 633 ])
630 634
631 #----------------------------------------------------------------------------- 635 #-----------------------------------------------------------------------------
632 # localserver/ie 636 # localserver/ie
633 637
634 env.Append(IE_CPPSRCS = [ 638 env.Append(IE_CPPSRCS = [
635 '$OPEN_DIR/localserver/ie/async_task_ie.cc', 639 '$OPEN_DIR/localserver/ie/async_task_ie.cc',
636 '$OPEN_DIR/localserver/ie/file_submit_behavior.cc', 640 '$OPEN_DIR/localserver/ie/file_submit_behavior.cc',
637 '$OPEN_DIR/localserver/ie/http_handler_ie.cc', 641 '$OPEN_DIR/localserver/ie/http_handler_ie.cc',
638 '$OPEN_DIR/localserver/ie/http_request_ie.cc', 642 '$OPEN_DIR/localserver/ie/http_request_ie.cc',
639 '$OPEN_DIR/localserver/common/progress_event.cc',
640 '$OPEN_DIR/localserver/ie/progress_input_stream.cc', 643 '$OPEN_DIR/localserver/ie/progress_input_stream.cc',
641 '$OPEN_DIR/localserver/ie/update_task_ie.cc', 644 '$OPEN_DIR/localserver/ie/update_task_ie.cc',
642 '$OPEN_DIR/localserver/ie/urlmon_utils.cc', 645 '$OPEN_DIR/localserver/ie/urlmon_utils.cc',
643 ]) 646 ])
644 647
645 #----------------------------------------------------------------------------- 648 #-----------------------------------------------------------------------------
646 # dummy_module 649 # dummy_module
647 650
648 env.Append(BROWSER_CPPSRCS = [ 651 env.Append(BROWSER_CPPSRCS = [
649 '$OPEN_DIR/dummy/dummy_module.cc', 652 '$OPEN_DIR/dummy/dummy_module.cc',
(...skipping 17 matching lines...) Expand all
667 '$OPEN_DIR/ui/common/permissions_dialog.html_m4', 670 '$OPEN_DIR/ui/common/permissions_dialog.html_m4',
668 '$OPEN_DIR/ui/common/settings_dialog.html_m4', 671 '$OPEN_DIR/ui/common/settings_dialog.html_m4',
669 '$OPEN_DIR/ui/common/shortcuts_dialog.html_m4', 672 '$OPEN_DIR/ui/common/shortcuts_dialog.html_m4',
670 ]) 673 ])
671 674
672 env.Append(FF3_I18N_M4SRCS = [ 675 env.Append(FF3_I18N_M4SRCS = [
673 '$OPEN_DIR/ui/generated/' + lang + '/i18n.dtd.m4' 676 '$OPEN_DIR/ui/generated/' + lang + '/i18n.dtd.m4'
674 for lang in env['I18N_LANGS'] 677 for lang in env['I18N_LANGS']
675 ]) 678 ])
676 679
677 #TODO: $(IE_OUTDIR)/string_table.res
678
679 #----------------------------------------------------------------------------- 680 #-----------------------------------------------------------------------------
680 # ui/common (built for all browsers) 681 # ui/common (built for all browsers)
681 682
682 env.Append(BROWSER_CPPSRCS = [ 683 env.Append(BROWSER_CPPSRCS = [
683 '$OPEN_DIR/ui/common/alert_dialog.cc', 684 '$OPEN_DIR/ui/common/alert_dialog.cc',
684 '$OPEN_DIR/ui/common/html_dialog.cc', 685 '$OPEN_DIR/ui/common/html_dialog.cc',
685 '$OPEN_DIR/ui/common/i18n_strings.cc', 686 '$OPEN_DIR/ui/common/i18n_strings.cc',
686 '$OPEN_DIR/ui/common/permissions_dialog.cc', 687 '$OPEN_DIR/ui/common/permissions_dialog.cc',
687 '$OPEN_DIR/ui/common/window_utils.cc', 688 '$OPEN_DIR/ui/common/window_utils.cc',
688 ]) 689 ])
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
962 '$OPEN_DIR/geolocation/wifi_data_provider_android.cc', 963 '$OPEN_DIR/geolocation/wifi_data_provider_android.cc',
963 '$OPEN_DIR/geolocation/wifi_data_provider_common.cc', 964 '$OPEN_DIR/geolocation/wifi_data_provider_common.cc',
964 '$OPEN_DIR/geolocation/wifi_data_provider_linux.cc', 965 '$OPEN_DIR/geolocation/wifi_data_provider_linux.cc',
965 '$OPEN_DIR/geolocation/wifi_data_provider_osx.cc', 966 '$OPEN_DIR/geolocation/wifi_data_provider_osx.cc',
966 '$OPEN_DIR/geolocation/wifi_data_provider_win32.cc', 967 '$OPEN_DIR/geolocation/wifi_data_provider_win32.cc',
967 '$OPEN_DIR/geolocation/wifi_data_provider_wince.cc', 968 '$OPEN_DIR/geolocation/wifi_data_provider_wince.cc',
968 '$OPEN_DIR/geolocation/wifi_data_provider_windows_common.cc', 969 '$OPEN_DIR/geolocation/wifi_data_provider_windows_common.cc',
969 ]) 970 ])
970 971
971 #----------------------------------------------------------------------------- 972 #-----------------------------------------------------------------------------
972 # media
973
974 # The Audio API has not been finalized for official builds.
975 if not env['OFFICIAL_BUILD']:
976 env.Append(BROWSER_CPPSRCS = [
977 '$OPEN_DIR/media/audio.cc',
978 '$OPEN_DIR/media/audio_recorder.cc',
979 '$OPEN_DIR/media/audio_recorder_test.cc',
980 '$OPEN_DIR/media/base_audio_recorder.cc',
981 '$OPEN_DIR/media/media.cc',
982 '$OPEN_DIR/media/media_data.cc',
983 '$OPEN_DIR/media/mock_audio_recorder.cc',
984 '$OPEN_DIR/media/pa_audio_recorder.cc',
985 '$OPEN_DIR/media/time_ranges.cc',
986 ])
987
988 #-----------------------------------------------------------------------------
989 # vista_broker 973 # vista_broker
990 974
991 env.Append(VISTA_BROKER_CPPSRCS = [ 975 env.Append(VISTA_BROKER_CPPSRCS = [
992 '$OPEN_DIR/base/common/process_utils_win32.cc', 976 '$OPEN_DIR/base/common/process_utils_win32.cc',
993 '$OPEN_DIR/base/common/string16.cc', 977 '$OPEN_DIR/base/common/string16.cc',
994 '$OPEN_DIR/base/common/string_utils.cc', 978 '$OPEN_DIR/base/common/string_utils.cc',
995 '$OPEN_DIR/desktop/shortcut_utils_win32.cc', 979 '$OPEN_DIR/desktop/shortcut_utils_win32.cc',
996 '$OPEN_DIR/vista_broker/vista_broker.cc', 980 '$OPEN_DIR/vista_broker/vista_broker.cc',
997 981
998 '$THIRD_PARTY_DIR/convert_utf/ConvertUTF.c' 982 '$THIRD_PARTY_DIR/convert_utf/ConvertUTF.c'
(...skipping 27 matching lines...) Expand all
1026 ]) 1010 ])
1027 1011
1028 #----------------------------------------------------------------------------- 1012 #-----------------------------------------------------------------------------
1029 # resources 1013 # resources
1030 1014
1031 env.Append(NPAPI_RESSRCS = [ 1015 env.Append(NPAPI_RESSRCS = [
1032 '$GENFILES_DIR/ui_resources.rc', 1016 '$GENFILES_DIR/ui_resources.rc',
1033 '$OPEN_DIR/base/npapi/module.rc', 1017 '$OPEN_DIR/base/npapi/module.rc',
1034 ]) 1018 ])
1035 1019
1020 # The string table uses multiple languages, which are not supported by
1021 # LoadString on WinCE.
1022 if env['OS'] != 'wince':
1023 env.Append(IE_RESSRCS = [
1024 '$GENFILES_DIR/string_table.rc',
1025 ])
1026
1036 env.Append(IE_RESSRCS = [ 1027 env.Append(IE_RESSRCS = [
1037 '$GENFILES_DIR/string_table.rc',
1038 '$GENFILES_DIR/ui_resources.rc', 1028 '$GENFILES_DIR/ui_resources.rc',
1039 '$OPEN_DIR/base/npapi/module.rc', 1029 '$OPEN_DIR/base/npapi/module.rc',
1040 ]) 1030 ])
1041 1031
1042 env.Append(FF3_RESOURCES = [ 1032 env.Append(FF3_RESOURCES = [
1043 '$FF3_OUTDIR/genfiles/browser-overlay.js', 1033 '$FF3_OUTDIR/genfiles/browser-overlay.js',
1044 '$FF3_OUTDIR/genfiles/browser-overlay.xul', 1034 '$FF3_OUTDIR/genfiles/browser-overlay.xul',
1045 '$FF3_OUTDIR/genfiles/permissions_dialog.html', 1035 '$FF3_OUTDIR/genfiles/permissions_dialog.html',
1046 '$FF3_OUTDIR/genfiles/settings_dialog.html', 1036 '$FF3_OUTDIR/genfiles/settings_dialog.html',
1047 '$FF3_OUTDIR/genfiles/shortcuts_dialog.html', 1037 '$FF3_OUTDIR/genfiles/shortcuts_dialog.html',
(...skipping 13 matching lines...) Expand all
1061 #----------------------------------------------------------------------------- 1051 #-----------------------------------------------------------------------------
1062 # libs 1052 # libs
1063 1053
1064 if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']: 1054 if not env['OFFICIAL_BUILD'] and env['OS'] in ['win32', 'osx']:
1065 env.Append( 1055 env.Append(
1066 LIBPATH = ['$THIRD_PARTY_DIR/skia'], 1056 LIBPATH = ['$THIRD_PARTY_DIR/skia'],
1067 LIBS = ['${LIBPREFIX}skia-${MODE}-${OS}-${ARCH}${LIBSUFFIX}'], 1057 LIBS = ['${LIBPREFIX}skia-${MODE}-${OS}-${ARCH}${LIBSUFFIX}'],
1068 ) 1058 )
1069 1059
1070 if env['OS'] == 'win32': 1060 if env['OS'] == 'win32':
1071 env.Append(NPAPI_LINKSRCS = [ 1061 env.Append(NPAPI_SHLINKSRCS = [
1072 '$THIRD_PARTY_DIR/v8/bin-${MODE}/libv8core.lib', 1062 '$THIRD_PARTY_DIR/v8/bin-${MODE}/v8_base.lib',
1073 '$THIRD_PARTY_DIR/v8/bin-${MODE}/no_snapshotv8.lib', 1063 '$THIRD_PARTY_DIR/v8/bin-${MODE}/v8_snapshot.lib',
1074 '$THIRD_PARTY_DIR/v8/bin-${MODE}/libjscre.lib',
1075 ]) 1064 ])
1076 env.Append(NPAPI_SHLINKSRCS = [ 1065 env.Append(NPAPI_SHLINKSRCS = [
1077 '$OPEN_DIR/base/chrome/module.def', 1066 '$OPEN_DIR/base/chrome/module.def',
1078 ]) 1067 ])
1079 env.Append(IE_SHLINKSRCS = [ 1068 env.Append(IE_SHLINKSRCS = [
1080 '$OPEN_DIR/tools/mscom.def', 1069 '$OPEN_DIR/tools/mscom.def',
1081 ]) 1070 ])
1082 1071
1083 Return('env') 1072 Return('env')
OLDNEW
« no previous file with comments | « gears/SConscript.googleurl ('k') | gears/SConscript.portaudio » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698