diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 00:56:28 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-03 00:56:28 +0000 |
commit | 2085baaafba8448c060ce566f6433a9bef4058bb (patch) | |
tree | 20e4610011554632e4cb6c3d365ac00083daee3b /third_party/libjingle/libjingle.gyp | |
parent | 06650c582f9cfcf3869c490f3dc1ca224d6c9963 (diff) | |
download | chromium_src-2085baaafba8448c060ce566f6433a9bef4058bb.zip chromium_src-2085baaafba8448c060ce566f6433a9bef4058bb.tar.gz chromium_src-2085baaafba8448c060ce566f6433a9bef4058bb.tar.bz2 |
New libjingle integrated to chrome.
BUG=none
TEST=Chrome Sync works
Review URL: http://codereview.chromium.org/2255007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle/libjingle.gyp')
-rw-r--r-- | third_party/libjingle/libjingle.gyp | 487 |
1 files changed, 321 insertions, 166 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 9473385..bcf8eb8 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -9,23 +9,28 @@ 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this? '_USE_32BIT_TIME_T', 'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS', + 'EXPAT_RELATIVE_PATH', ], 'include_dirs': [ './overrides', - './files', + './source', + '../../third_party/expat/files' ], 'dependencies': [ '../expat/expat.gyp:expat', '../../base/base.gyp:base', + '../../net/net.gyp:net_base', ], 'direct_dependent_settings': { 'include_dirs': [ './overrides', - './files', + './source', + '../../third_party/expat/files' ], 'defines': [ 'FEATURE_ENABLE_SSL', 'FEATURE_ENABLE_VOICEMAIL', + 'EXPAT_RELATIVE_PATH', ], 'conditions': [ ['OS=="win"', { @@ -33,22 +38,67 @@ 'libraries': [ '-lsecur32.lib', '-lcrypt32.lib', + '-liphlpapi.lib', ], }, }], + ['OS=="win"', { + 'include_dirs': [ + '../third_party/platformsdk_win7/files/Include', + ], + 'defines': [ + '_CRT_SECURE_NO_WARNINGS', # Suppres warnings about _vsnprinf + ], + }], + ['OS=="linux"', { + 'defines': [ + 'LINUX', + ], + }], + ['OS=="mac"', { + 'defines': [ + 'OSX', + ], + }], ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'defines': [ 'POSIX', ], }], + ['OS=="openbsd" or OS=="freebsd"', { + 'defines': [ + 'BSD', + ], + }], ], }, + 'all_dependent_settings': { + 'configurations': { + 'Debug': { + 'defines': [ + # TODO(sergeyu): Fix libjingle to use NDEBUG instead of + # _DEBUG and remove this define. + '_DEBUG', + ], + } + }, + }, 'conditions': [ ['OS=="win"', { 'include_dirs': [ '../third_party/platformsdk_win7/files/Include', ], }], + ['OS=="linux"', { + 'defines': [ + 'LINUX', + ], + }], + ['OS=="mac"', { + 'defines': [ + 'OSX', + ], + }], ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'defines': [ 'POSIX', @@ -66,183 +116,288 @@ 'target_name': 'libjingle', 'type': '<(library)', 'sources': [ - - # everything in files/talk/p2p is unneeded and has been removed - # 'files/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', # openssl - # 'files/talk/base/basictypes.h', # overridden - # 'files/talk/base/natserver_main.cc', # has a main() - # 'files/talk/base/openssladapter.cc', # openssl - # 'files/talk/base/openssladapter.h', # openssl - # 'files/talk/base/winsock_initializer.cc', # overridden - 'files/talk/base/asynchttprequest.cc', - 'files/talk/base/asynchttprequest.h', - 'files/talk/base/asyncpacketsocket.cc', - 'files/talk/base/asyncpacketsocket.h', - 'files/talk/base/asynctcpsocket.h', - 'files/talk/base/asynctcpsocket.cc', - 'files/talk/base/asyncudpsocket.cc', - 'files/talk/base/asyncudpsocket.h', - 'files/talk/base/autodetectproxy.cc', - 'files/talk/base/autodetectproxy.h', - 'files/talk/base/base64.cc', - 'files/talk/base/base64.h', - 'files/talk/base/basicdefs.h', - 'files/talk/base/bytebuffer.cc', - 'files/talk/base/bytebuffer.h', - 'files/talk/base/common.cc', - 'files/talk/base/common.h', - 'files/talk/base/criticalsection.h', - 'files/talk/base/cryptstring.h', - 'files/talk/base/diskcache.cc', - 'files/talk/base/diskcache.h', - 'files/talk/base/diskcachestd.cc', - 'files/talk/base/diskcachestd.h', - 'files/talk/base/fileutils.cc', - 'files/talk/base/fileutils.h', - 'files/talk/base/firewallsocketserver.cc', - 'files/talk/base/firewallsocketserver.h', - 'files/talk/base/helpers.cc', - 'files/talk/base/helpers.h', - 'files/talk/base/host.cc', - 'files/talk/base/host.h', - 'files/talk/base/httpbase.cc', - 'files/talk/base/httpbase.h', - 'files/talk/base/httpclient.cc', - 'files/talk/base/httpclient.h', - 'files/talk/base/httpcommon-inl.h', - 'files/talk/base/httpcommon.cc', - 'files/talk/base/httpcommon.h', - 'files/talk/base/httpserver.cc', - 'files/talk/base/httpserver.h', - 'files/talk/base/logging.cc', - 'files/talk/base/logging.h', - 'files/talk/base/md5c.c', - 'files/talk/base/md5c.h', - 'files/talk/base/messagequeue.cc', - 'files/talk/base/messagequeue.h', - 'files/talk/base/natserver.cc', - 'files/talk/base/natserver.h', - 'files/talk/base/natsocketfactory.cc', - 'files/talk/base/natsocketfactory.h', - 'files/talk/base/nattypes.cc', - 'files/talk/base/nattypes.h', - 'files/talk/base/network.cc', - 'files/talk/base/network.h', - 'files/talk/base/pathutils.cc', - 'files/talk/base/pathutils.h', - 'files/talk/base/physicalsocketserver.cc', - 'files/talk/base/physicalsocketserver.h', - 'files/talk/base/proxydetect.cc', - 'files/talk/base/proxydetect.h', - 'files/talk/base/proxyinfo.cc', - 'files/talk/base/proxyinfo.h', - 'files/talk/base/signalthread.cc', - 'files/talk/base/signalthread.h', - 'files/talk/base/socketadapters.cc', - 'files/talk/base/socketadapters.h', - 'files/talk/base/socketaddress.cc', - 'files/talk/base/socketaddress.h', - 'files/talk/base/socketaddresspair.cc', - 'files/talk/base/socketaddresspair.h', - 'files/talk/base/socketfactory.h', - 'files/talk/base/socketpool.cc', - 'files/talk/base/socketpool.h', - 'files/talk/base/socketserver.h', - 'files/talk/base/socketstream.h', - 'files/talk/base/ssladapter.cc', - 'files/talk/base/ssladapter.h', - 'files/talk/base/stl_decl.h', - 'files/talk/base/stream.cc', - 'files/talk/base/stream.h', - 'files/talk/base/streamutils.cc', - 'files/talk/base/streamutils.h', - 'files/talk/base/stringdigest.cc', - 'files/talk/base/stringdigest.h', - 'files/talk/base/stringencode.cc', - 'files/talk/base/stringencode.h', - 'files/talk/base/stringutils.cc', - 'files/talk/base/stringutils.h', - 'files/talk/base/tarstream.cc', - 'files/talk/base/tarstream.h', - 'files/talk/base/task.cc', - 'files/talk/base/task.h', - 'files/talk/base/taskrunner.cc', - 'files/talk/base/taskrunner.h', - 'files/talk/base/testclient.cc', - 'files/talk/base/testclient.h', - 'files/talk/base/thread.cc', - 'files/talk/base/thread.h', - 'files/talk/base/time.cc', - 'files/talk/base/time.h', - 'files/talk/base/urlencode.cc', - 'files/talk/base/urlencode.h', - 'files/talk/base/virtualsocketserver.cc', - 'files/talk/base/virtualsocketserver.h', - 'files/talk/base/winsock_initializer.h', - 'files/talk/xmllite/qname.cc', - 'files/talk/xmllite/qname.h', - 'files/talk/xmllite/xmlbuilder.cc', - 'files/talk/xmllite/xmlbuilder.h', - 'files/talk/xmllite/xmlconstants.cc', - 'files/talk/xmllite/xmlconstants.h', - 'files/talk/xmllite/xmlelement.cc', - 'files/talk/xmllite/xmlelement.h', - 'files/talk/xmllite/xmlnsstack.cc', - 'files/talk/xmllite/xmlnsstack.h', - 'files/talk/xmllite/xmlparser.cc', - 'files/talk/xmllite/xmlparser.h', - 'files/talk/xmllite/xmlprinter.cc', - 'files/talk/xmllite/xmlprinter.h', - 'files/talk/xmpp/jid.cc', - 'files/talk/xmpp/jid.h', - 'files/talk/xmpp/ratelimitmanager.cc', - 'files/talk/xmpp/ratelimitmanager.h', - 'files/talk/xmpp/saslmechanism.cc', - 'files/talk/xmpp/saslmechanism.h', - 'files/talk/xmpp/xmppclient.cc', - 'files/talk/xmpp/xmppclient.h', - 'files/talk/xmpp/xmppconstants.cc', - 'files/talk/xmpp/xmppconstants.h', - 'files/talk/xmpp/xmppengineimpl.cc', - 'files/talk/xmpp/xmppengineimpl.h', - 'files/talk/xmpp/xmppengineimpl_iq.cc', - 'files/talk/xmpp/xmppengineimpl_iq.h', - 'files/talk/xmpp/xmpplogintask.cc', - 'files/talk/xmpp/xmpplogintask.h', - 'files/talk/xmpp/xmppstanzaparser.cc', - 'files/talk/xmpp/xmppstanzaparser.h', - 'files/talk/xmpp/xmpptask.cc', - 'files/talk/xmpp/xmpptask.h', 'overrides/talk/base/basictypes.h', 'overrides/talk/base/constructormagic.h', + + # Need to override logging.h because we need + # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work. + # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to + # libjingle and remove this override. + 'overrides/talk/base/logging.h', + 'overrides/talk/base/scoped_ptr.h', - 'overrides/config.h', + + # Libjingle's QName is not threadsafe, so we need to use our own version + # here. + # TODO(sergeyu): Fix QName in Libjingle. + 'overrides/talk/xmllite/qname.cc', + 'overrides/talk/xmllite/qname.h', + + 'source/talk/base/DiskCacheStd.h', + 'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h', + 'source/talk/base/asyncfile.h', + 'source/talk/base/asynchttprequest.cc', + 'source/talk/base/asynchttprequest.h', + 'source/talk/base/asyncpacketsocket.cc', + 'source/talk/base/asyncpacketsocket.h', + 'source/talk/base/asyncsocket.h', + 'source/talk/base/asynctcpsocket.cc', + 'source/talk/base/asynctcpsocket.h', + 'source/talk/base/asyncudpsocket.cc', + 'source/talk/base/asyncudpsocket.h', + 'source/talk/base/autodetectproxy.cc', + 'source/talk/base/autodetectproxy.h', + 'source/talk/base/base64.cc', + 'source/talk/base/base64.h', + 'source/talk/base/basicdefs.h', + 'source/talk/base/bytebuffer.cc', + 'source/talk/base/bytebuffer.h', + 'source/talk/base/byteorder.h', + 'source/talk/base/checks.cc', + 'source/talk/base/checks.h', + 'source/talk/base/common.cc', + 'source/talk/base/common.h', + 'source/talk/base/criticalsection.h', + 'source/talk/base/cryptstring.h', + 'source/talk/base/diskcache.cc', + 'source/talk/base/diskcache.h', + 'source/talk/base/event.cc', + 'source/talk/base/event.h', + 'source/talk/base/fakenetwork.h', + 'source/talk/base/fileutils.cc', + 'source/talk/base/fileutils.h', + 'source/talk/base/fileutils_mock.h', + 'source/talk/base/firewallsocketserver.cc', + 'source/talk/base/firewallsocketserver.h', + 'source/talk/base/flags.cc', + 'source/talk/base/flags.h', + 'source/talk/base/hash.h', + 'source/talk/base/helpers.cc', + 'source/talk/base/helpers.h', + 'source/talk/base/host.cc', + 'source/talk/base/host.h', + 'source/talk/base/httpbase.cc', + 'source/talk/base/httpbase.h', + 'source/talk/base/httpclient.h', + 'source/talk/base/httpclient.cc', + 'source/talk/base/httpcommon-inl.h', + 'source/talk/base/httpcommon.cc', + 'source/talk/base/httpcommon.h', + 'source/talk/base/httprequest.cc', + 'source/talk/base/httprequest.h', + 'source/talk/base/icftypes.h', + 'source/talk/base/linked_ptr.h', + 'source/talk/base/logging.cc', + 'source/talk/base/md5.h', + 'source/talk/base/md5c.c', + 'source/talk/base/messagehandler.cc', + 'source/talk/base/messagehandler.h', + 'source/talk/base/messagequeue.cc', + 'source/talk/base/messagequeue.h', + 'source/talk/base/netfw.h', + 'source/talk/base/nethelpers.cc', + 'source/talk/base/nethelpers.h', + 'source/talk/base/network.cc', + 'source/talk/base/network.h', + 'source/talk/base/pathutils.cc', + 'source/talk/base/pathutils.h', + 'source/talk/base/physicalsocketserver.cc', + 'source/talk/base/physicalsocketserver.h', + 'source/talk/base/proxydetect.cc', + 'source/talk/base/proxydetect.h', + 'source/talk/base/proxyinfo.cc', + 'source/talk/base/proxyinfo.h', + 'source/talk/base/sec_buffer.h', + 'source/talk/base/signalthread.cc', + 'source/talk/base/signalthread.h', + 'source/talk/base/sigslot.h', + 'source/talk/base/sigslotrepeater.h', + 'source/talk/base/socket.h', + 'source/talk/base/socketadapters.cc', + 'source/talk/base/socketadapters.h', + 'source/talk/base/socketaddress.cc', + 'source/talk/base/socketaddress.h', + 'source/talk/base/socketfactory.h', + 'source/talk/base/socketpool.cc', + 'source/talk/base/socketpool.h', + 'source/talk/base/socketserver.h', + 'source/talk/base/socketstream.h', + 'source/talk/base/ssladapter.cc', + 'source/talk/base/ssladapter.h', + 'source/talk/base/sslsocketfactory.cc', + 'source/talk/base/sslsocketfactory.h', + 'source/talk/base/stream.cc', + 'source/talk/base/stream.h', + 'source/talk/base/stringdigest.cc', + 'source/talk/base/stringdigest.h', + 'source/talk/base/stringencode.cc', + 'source/talk/base/stringencode.h', + 'source/talk/base/stringutils.cc', + 'source/talk/base/stringutils.h', + 'source/talk/base/task.cc', + 'source/talk/base/task.h', + 'source/talk/base/taskparent.cc', + 'source/talk/base/taskparent.h', + 'source/talk/base/taskrunner.cc', + 'source/talk/base/taskrunner.h', + 'source/talk/base/thread.cc', + 'source/talk/base/thread.h', + 'source/talk/base/time.cc', + 'source/talk/base/time.h', + 'source/talk/base/urlencode.cc', + 'source/talk/base/urlencode.h', + 'source/talk/xmllite/xmlbuilder.cc', + 'source/talk/xmllite/xmlbuilder.h', + 'source/talk/xmllite/xmlconstants.cc', + 'source/talk/xmllite/xmlconstants.h', + 'source/talk/xmllite/xmlelement.cc', + 'source/talk/xmllite/xmlelement.h', + 'source/talk/xmllite/xmlnsstack.cc', + 'source/talk/xmllite/xmlnsstack.h', + 'source/talk/xmllite/xmlparser.cc', + 'source/talk/xmllite/xmlparser.h', + 'source/talk/xmllite/xmlprinter.cc', + 'source/talk/xmllite/xmlprinter.h', + 'source/talk/xmpp/asyncsocket.h', + 'source/talk/xmpp/constants.cc', + 'source/talk/xmpp/constants.h', + 'source/talk/xmpp/jid.cc', + 'source/talk/xmpp/jid.h', + 'source/talk/xmpp/plainsaslhandler.h', + 'source/talk/xmpp/prexmppauth.h', + 'source/talk/xmpp/ratelimitmanager.cc', + 'source/talk/xmpp/ratelimitmanager.h', + 'source/talk/xmpp/saslcookiemechanism.h', + 'source/talk/xmpp/saslhandler.h', + 'source/talk/xmpp/saslmechanism.cc', + 'source/talk/xmpp/saslmechanism.h', + 'source/talk/xmpp/saslplainmechanism.h', + 'source/talk/xmpp/xmppclient.cc', + 'source/talk/xmpp/xmppclient.h', + 'source/talk/xmpp/xmppclientsettings.h', + 'source/talk/xmpp/xmppengine.h', + 'source/talk/xmpp/xmppengineimpl.cc', + 'source/talk/xmpp/xmppengineimpl.h', + 'source/talk/xmpp/xmppengineimpl_iq.cc', + 'source/talk/xmpp/xmpplogintask.cc', + 'source/talk/xmpp/xmpplogintask.h', + 'source/talk/xmpp/xmppstanzaparser.cc', + 'source/talk/xmpp/xmppstanzaparser.h', + 'source/talk/xmpp/xmpptask.cc', + 'source/talk/xmpp/xmpptask.h', ], 'conditions': [ ['OS=="win"', { 'sources': [ - 'files/talk/base/convert.h', # win32 only - 'files/talk/base/diskcache_win32.cc', # win32 only - 'files/talk/base/diskcache_win32.h', # win32 only - 'files/talk/base/schanneladapter.cc', - 'files/talk/base/schanneladapter.h', - 'files/talk/base/win32.h', - 'files/talk/base/win32filesystem.cc', - 'files/talk/base/win32filesystem.h', - 'files/talk/base/win32window.h', - 'files/talk/base/win32window.cc', - 'files/talk/base/winfirewall.cc', - 'files/talk/base/winfirewall.h', - 'files/talk/base/winping.cc', - 'files/talk/base/winping.h', - 'overrides/talk/base/winsock_initializer.cc', + 'overrides/talk/base/win32socketinit.cc', + 'source/talk/base/convert.h', # win32 only + 'source/talk/base/schanneladapter.cc', + 'source/talk/base/schanneladapter.h', + 'source/talk/base/win32.h', + 'source/talk/base/win32.cc', + 'source/talk/base/win32filesystem.cc', + 'source/talk/base/win32filesystem.h', + 'source/talk/base/win32window.h', + 'source/talk/base/win32window.cc', + 'source/talk/base/win32securityerrors.cc', + 'source/talk/base/winfirewall.cc', + 'source/talk/base/winfirewall.h', + 'source/talk/base/winping.cc', + 'source/talk/base/winping.h', ], }], ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', { 'sources': [ - 'files/talk/base/unixfilesystem.cc', + 'source/talk/base/sslstreamadapter.cc', + 'source/talk/base/sslstreamadapter.h', + 'source/talk/base/unixfilesystem.cc', + 'source/talk/base/unixfilesystem.h', + ], + }], + ['OS=="linux"', { + 'sources': [ + 'source/talk/base/linux.cc', + 'source/talk/base/linux.h', ], }], + ['OS=="mac"', { + 'sources': [ + 'source/talk/base/macconversion.cc', + 'source/talk/base/macconversion.h', + 'source/talk/base/macutils.cc', + 'source/talk/base/macutils.h', + ], + }], + ], + }, + # This has to be is a separate project due to a bug in MSVS: + # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008 + # We have two files named "constants.cc" and MSVS doesn't handle this + # properly. + { + 'target_name': 'libjingle_p2p', + 'type': '<(library)', + 'sources': [ + 'source/talk/p2p/base/candidate.h', + 'source/talk/p2p/base/common.h', + 'source/talk/p2p/base/constants.cc', + 'source/talk/p2p/base/constants.h', + 'source/talk/p2p/base/p2ptransport.cc', + 'source/talk/p2p/base/p2ptransport.h', + 'source/talk/p2p/base/p2ptransportchannel.cc', + 'source/talk/p2p/base/p2ptransportchannel.h', + 'source/talk/p2p/base/port.cc', + 'source/talk/p2p/base/port.h', + 'source/talk/p2p/base/portallocator.h', + 'source/talk/p2p/base/pseudotcp.cc', + 'source/talk/p2p/base/pseudotcp.h', + 'source/talk/p2p/base/rawtransport.cc', + 'source/talk/p2p/base/rawtransport.h', + 'source/talk/p2p/base/rawtransportchannel.cc', + 'source/talk/p2p/base/rawtransportchannel.h', + 'source/talk/p2p/base/relayport.cc', + 'source/talk/p2p/base/relayport.h', + 'source/talk/p2p/base/session.cc', + 'source/talk/p2p/base/session.h', + 'source/talk/p2p/base/sessionclient.h', + 'source/talk/p2p/base/sessiondescription.h', + 'source/talk/p2p/base/sessionid.h', + 'source/talk/p2p/base/sessionmanager.cc', + 'source/talk/p2p/base/sessionmanager.h', + 'source/talk/p2p/base/stun.cc', + 'source/talk/p2p/base/stun.h', + 'source/talk/p2p/base/stunport.cc', + 'source/talk/p2p/base/stunport.h', + 'source/talk/p2p/base/stunrequest.cc', + 'source/talk/p2p/base/stunrequest.h', + 'source/talk/p2p/base/tcpport.cc', + 'source/talk/p2p/base/tcpport.h', + 'source/talk/p2p/base/transport.cc', + 'source/talk/p2p/base/transport.h', + 'source/talk/p2p/base/transportchannel.cc', + 'source/talk/p2p/base/transportchannel.h', + 'source/talk/p2p/base/transportchannelimpl.h', + 'source/talk/p2p/base/transportchannelproxy.cc', + 'source/talk/p2p/base/transportchannelproxy.h', + 'source/talk/p2p/base/udpport.cc', + 'source/talk/p2p/base/udpport.h', + 'source/talk/p2p/client/basicportallocator.cc', + 'source/talk/p2p/client/basicportallocator.h', + 'source/talk/p2p/client/httpportallocator.cc', + 'source/talk/p2p/client/httpportallocator.h', + 'source/talk/p2p/client/sessionmanagertask.h', + 'source/talk/p2p/client/sessionsendtask.h', + 'source/talk/p2p/client/socketmonitor.cc', + 'source/talk/p2p/client/socketmonitor.h', + 'source/talk/session/tunnel/pseudotcpchannel.cc', + 'source/talk/session/tunnel/pseudotcpchannel.h', + 'source/talk/session/tunnel/securetunnelsessionclient.cc', + 'source/talk/session/tunnel/securetunnelsessionclient.h', + 'source/talk/session/tunnel/tunnelsessionclient.cc', + 'source/talk/session/tunnel/tunnelsessionclient.h', + ], + 'dependencies': [ + 'libjingle', ], }, ], |