diff options
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 242 |
1 files changed, 81 insertions, 161 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 34d3600..33f4a4a 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -13,125 +13,13 @@ # Deps info. 'xul_include_directories': [ - # TODO(slightlyoff): pare these down. This makes it too easy to - # regress to using unfrozen FF interfaces. - '<(xul_sdk_dir)/include', - '<(xul_sdk_dir)/include/accessibility', - '<(xul_sdk_dir)/include/alerts', - '<(xul_sdk_dir)/include/appcomps', - '<(xul_sdk_dir)/include/appshell', - '<(xul_sdk_dir)/include/autocomplete', - '<(xul_sdk_dir)/include/autoconfig', - '<(xul_sdk_dir)/include/ax_common', - '<(xul_sdk_dir)/include/browser', - '<(xul_sdk_dir)/include/cairo', '<(xul_sdk_dir)/include/caps', - '<(xul_sdk_dir)/include/chardet', - '<(xul_sdk_dir)/include/chrome', - '<(xul_sdk_dir)/include/commandhandler', - '<(xul_sdk_dir)/include/composer', - '<(xul_sdk_dir)/include/content', - '<(xul_sdk_dir)/include/contentprefs', - '<(xul_sdk_dir)/include/cookie', - '<(xul_sdk_dir)/include/crashreporter', - '<(xul_sdk_dir)/include/docshell', '<(xul_sdk_dir)/include/dom', - '<(xul_sdk_dir)/include/downloads', - '<(xul_sdk_dir)/include/editor', - '<(xul_sdk_dir)/include/embed_base', - '<(xul_sdk_dir)/include/embedcomponents', - '<(xul_sdk_dir)/include/expat', - '<(xul_sdk_dir)/include/extensions', - '<(xul_sdk_dir)/include/exthandler', - '<(xul_sdk_dir)/include/exthelper', - '<(xul_sdk_dir)/include/fastfind', - '<(xul_sdk_dir)/include/feeds', - '<(xul_sdk_dir)/include/find', - '<(xul_sdk_dir)/include/gfx', - '<(xul_sdk_dir)/include/htmlparser', - '<(xul_sdk_dir)/include/imgicon', - '<(xul_sdk_dir)/include/imglib2', - '<(xul_sdk_dir)/include/inspector', - '<(xul_sdk_dir)/include/intl', - '<(xul_sdk_dir)/include/jar', - '<(xul_sdk_dir)/include/java', - '<(xul_sdk_dir)/include/jpeg', '<(xul_sdk_dir)/include/js', - '<(xul_sdk_dir)/include/jsdebug', - '<(xul_sdk_dir)/include/jsurl', - '<(xul_sdk_dir)/include/layout', - '<(xul_sdk_dir)/include/lcms', - '<(xul_sdk_dir)/include/libbz2', - '<(xul_sdk_dir)/include/libmar', - '<(xul_sdk_dir)/include/libpixman', - '<(xul_sdk_dir)/include/libreg', - '<(xul_sdk_dir)/include/liveconnect', - '<(xul_sdk_dir)/include/locale', - '<(xul_sdk_dir)/include/loginmgr', - '<(xul_sdk_dir)/include/lwbrk', - '<(xul_sdk_dir)/include/mimetype', - '<(xul_sdk_dir)/include/morkreader', - '<(xul_sdk_dir)/include/necko', - '<(xul_sdk_dir)/include/nkcache', '<(xul_sdk_dir)/include/nspr', - '<(xul_sdk_dir)/include/nss', - '<(xul_sdk_dir)/include/oji', - '<(xul_sdk_dir)/include/parentalcontrols', - '<(xul_sdk_dir)/include/pipboot', - '<(xul_sdk_dir)/include/pipnss', - '<(xul_sdk_dir)/include/pippki', - '<(xul_sdk_dir)/include/places', - '<(xul_sdk_dir)/include/plugin', - '<(xul_sdk_dir)/include/png', - '<(xul_sdk_dir)/include/pref', - '<(xul_sdk_dir)/include/prefetch', - '<(xul_sdk_dir)/include/profdirserviceprovider', - '<(xul_sdk_dir)/include/profile', - '<(xul_sdk_dir)/include/rdf', - '<(xul_sdk_dir)/include/rdfutil', - '<(xul_sdk_dir)/include/satchel', - '<(xul_sdk_dir)/include/shistory', - '<(xul_sdk_dir)/include/simple', - '<(xul_sdk_dir)/include/spellchecker', - '<(xul_sdk_dir)/include/sqlite3', - '<(xul_sdk_dir)/include/storage', '<(xul_sdk_dir)/include/string', - '<(xul_sdk_dir)/include/thebes', - '<(xul_sdk_dir)/include/toolkitcomps', - '<(xul_sdk_dir)/include/txmgr', - '<(xul_sdk_dir)/include/txtsvc', - '<(xul_sdk_dir)/include/uconv', - '<(xul_sdk_dir)/include/ucvcn', - '<(xul_sdk_dir)/include/ucvibm', - '<(xul_sdk_dir)/include/ucvja', - '<(xul_sdk_dir)/include/ucvko', - '<(xul_sdk_dir)/include/ucvlatin', - '<(xul_sdk_dir)/include/ucvmath', - '<(xul_sdk_dir)/include/ucvtw', - '<(xul_sdk_dir)/include/ucvtw2', - '<(xul_sdk_dir)/include/unicharutil', - '<(xul_sdk_dir)/include/update', - '<(xul_sdk_dir)/include/uriloader', - '<(xul_sdk_dir)/include/urlformatter', - '<(xul_sdk_dir)/include/util', - '<(xul_sdk_dir)/include/view', - '<(xul_sdk_dir)/include/webbrowserpersist', - '<(xul_sdk_dir)/include/webbrwsr', - '<(xul_sdk_dir)/include/webshell', - '<(xul_sdk_dir)/include/widget', - '<(xul_sdk_dir)/include/windowwatcher', - '<(xul_sdk_dir)/include/xml', - '<(xul_sdk_dir)/include/xml-rpc', '<(xul_sdk_dir)/include/xpcom', '<(xul_sdk_dir)/include/xpconnect', - '<(xul_sdk_dir)/include/xpinstall', - '<(xul_sdk_dir)/include/xulapp', - '<(xul_sdk_dir)/include/xuldoc', - '<(xul_sdk_dir)/include/xulrunner', - '<(xul_sdk_dir)/include/xultmpl', - '<(xul_sdk_dir)/include/zipwriter', - '<(xul_sdk_dir)/include/zlib', - '<(xul_sdk_dir)/sdk/include', ], 'conditions': [ ['OS=="win"', { @@ -225,15 +113,21 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'base_noicu', + 'chrome_frame_ie', 'chrome_frame_npapi', 'chrome_frame_strings', 'xulrunner_sdk', ], 'sources': [ + 'chrome_tab.h', + 'chrome_tab.idl', 'chrome_frame_npapi_unittest.cc', 'chrome_frame_unittest_main.cc', 'chrome_launcher_unittest.cc', - 'html_utils_unittest.cc', + 'test/com_message_event_unittest.cc', + 'test/html_util_unittests.cc', + 'test/http_negotiate_unittest.cc', + 'test/util_unittests.cc', 'unittest_precompile.h', 'unittest_precompile.cc', 'urlmon_upload_data_stream.cc', @@ -247,6 +141,7 @@ ], 'resource_include_dirs': [ '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)', ], 'conditions': [ ['OS=="win"', { @@ -255,10 +150,6 @@ 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], }, }, - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc', - ], 'dependencies': [ # TODO(slightlyoff): Get automation targets working on OS X '../chrome/chrome.gyp:automation', @@ -272,7 +163,6 @@ 'target_name': 'chrome_frame_tests', 'type': 'executable', 'dependencies': [ - # 'base_noicu', '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', @@ -282,7 +172,6 @@ '../third_party/libxslt/libxslt.gyp:libxslt', 'chrome_frame_strings', 'chrome_frame_npapi', - # 'npchrome_tab', 'xulrunner_sdk', ], 'sources': [ @@ -293,17 +182,13 @@ 'test/chrome_frame_automation_mock.h', 'test/chrome_frame_unittests.cc', 'test/chrome_frame_unittests.h', - 'test/com_message_event_unittest.cc', 'test/function_stub_unittest.cc', - 'test/html_util_unittests.cc', - 'test/http_negotiate_unittest.cc', 'test/http_server.cc', 'test/http_server.h', 'test/run_all_unittests.cc', 'test/test_server.cc', 'test/test_server.h', 'test/test_server_test.cc', - 'test/util_unittests.cc', 'chrome_frame_automation.cc', 'chrome_frame_histograms.h', 'chrome_frame_histograms.cc', @@ -342,10 +227,6 @@ 'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'], }, }, - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc', - ], 'dependencies': [ '../chrome/chrome.gyp:automation', '../chrome/installer/installer.gyp:installer_util', @@ -505,10 +386,6 @@ ], 'conditions': [ ['OS=="win"', { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc', - ], 'dependencies': [ # TODO(slightlyoff): Get automation targets working on OS X '../chrome/chrome.gyp:automation', @@ -537,6 +414,8 @@ 'chrome_frame_npapi.h', 'chrome_launcher.cc', 'chrome_launcher.h', + 'ff_30_privilege_check.cc', + 'ff_privilege_check.h', 'html_utils.cc', 'html_utils.h', 'np_browser_functions.cc', @@ -552,6 +431,7 @@ 'plugin_url_request.cc', 'plugin_url_request.h', 'scoped_ns_ptr_win.h', + 'script_security_manager.h', 'sync_msg_reply_dispatcher.cc', 'sync_msg_reply_dispatcher.h', 'utils.cc', @@ -633,24 +513,14 @@ ], }, { - 'target_name': 'npchrome_tab', - 'type': 'shared_library', - 'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2', + 'target_name': 'chrome_frame_ie', + 'type': 'static_library', 'dependencies': [ - 'base_noicu', - 'chrome_frame_npapi', 'chrome_frame_strings', - 'chrome_launcher', - 'xulrunner_sdk', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', '../build/temp_gyp/googleurl.gyp:googleurl', - # FIXME(slightlyoff): - # gigantic hack to get these to build from main Chrome sln. - 'chrome_frame_perftests', - 'chrome_frame_tests', - 'chrome_frame_unittests', - 'chrome_frame_net_tests', + ], 'sources': [ 'bho.cc', @@ -663,40 +533,28 @@ 'chrome_frame_activex.h', 'chrome_frame_activex_base.h', 'chrome_frame_activex.rgs', - 'chrome_frame_npapi.rgs', - 'chrome_frame_npapi_entrypoints.cc', + 'chrome_frame_histograms.h', + 'chrome_frame_histograms.cc', 'chrome_frame_reporting.cc', 'chrome_frame_reporting.h', 'chrome_protocol.cc', 'chrome_protocol.h', 'chrome_protocol.rgs', - 'chrome_tab.cc', - 'chrome_tab.def', 'chrome_tab.h', 'chrome_tab.idl', - # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can - # figure out something more gyp-ish. - 'resources/tlb_resource.rc', - 'chrome_tab.rgs', - 'chrome_tab_version.rc.version', 'com_message_event.cc', 'com_message_event.h', 'com_type_info_holder.cc', 'com_type_info_holder.h', - 'ff_30_privilege_check.cc', - 'ff_privilege_check.h', 'find_dialog.cc', 'find_dialog.h', 'function_stub.h', 'http_negotiate.h', 'http_negotiate.cc', - 'iids.cc', 'in_place_menu.h', 'ole_document_impl.h', 'protocol_sink_wrap.cc', 'protocol_sink_wrap.h', - 'resource.h', - 'script_security_manager.h', 'sync_msg_reply_dispatcher.cc', 'sync_msg_reply_dispatcher.h', 'extra_system_apis.h', @@ -706,13 +564,75 @@ 'urlmon_upload_data_stream.h', 'vtable_patch_manager.cc', 'vtable_patch_manager.h', - 'chrome_frame_histograms.h', - 'chrome_frame_histograms.cc', ], 'include_dirs': [ # To allow including "chrome_tab.h" '<(INTERMEDIATE_DIR)', - '<(INTERMEDIATE_DIR)/../npchrome_tab', + '<(INTERMEDIATE_DIR)/../chrome_frame', + ], + 'conditions': [ + ['OS=="win"', { + # NOTE(slightlyoff): + # this is a fix for the include dirs length limit on the resource + # compiler, tickled by the xul_include_dirs variable + 'resource_include_dirs': [ + '<(INTERMEDIATE_DIR)' + ], + 'dependencies': [ + '../breakpad/breakpad.gyp:breakpad_handler', + '../chrome/chrome.gyp:automation', + # Make the archive build happy. + '../chrome/chrome.gyp:syncapi', + # Installer + '../chrome/installer/installer.gyp:installer_util', + '../google_update/google_update.gyp:google_update', + # Crash Reporting + 'crash_reporting/crash_reporting.gyp:crash_report', + 'crash_reporting/crash_reporting.gyp:vectored_handler_tests', + ], + },], + ], + }, + { + 'target_name': 'npchrome_frame', + 'type': 'shared_library', + 'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2', + 'dependencies': [ + 'base_noicu', + 'chrome_frame_ie', + 'chrome_frame_npapi', + 'chrome_frame_strings', + 'chrome_launcher', + 'xulrunner_sdk', + '../chrome/chrome.gyp:common', + '../chrome/chrome.gyp:utility', + '../build/temp_gyp/googleurl.gyp:googleurl', + # FIXME(slightlyoff): + # gigantic hack to get these to build from main Chrome sln. + 'chrome_frame_perftests', + 'chrome_frame_tests', + 'chrome_frame_unittests', + 'chrome_frame_net_tests', + ], + 'sources': [ + 'chrome_frame_npapi.rgs', + 'chrome_frame_npapi_entrypoints.cc', + 'chrome_tab.cc', + 'chrome_tab.def', + 'chrome_tab.h', + 'chrome_tab.idl', + # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can + # figure out something more gyp-ish. + 'resources/tlb_resource.rc', + 'chrome_tab.rgs', + 'chrome_tab_version.rc.version', + 'iids.cc', + 'resource.h', + ], + 'include_dirs': [ + # To allow including "chrome_tab.h" + '<(INTERMEDIATE_DIR)', + '<(INTERMEDIATE_DIR)/../chrome_frame', ], 'conditions': [ ['OS=="win"', { |