move xmpp and p2p to webrtc
Create a copy of talk/xmpp and talk/p2p under webrtc/libjingle/xmpp and webrtc/p2p. Also makes libjingle use those version instead of the one in the talk folder. BUG=3379 Review URL: https://webrtc-codereview.appspot.com/26999004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7549 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -299,7 +299,7 @@
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'libjingle',
|
||||
'type': 'static_library',
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'<(DEPTH)/third_party/expat/expat.gyp:expat',
|
||||
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
|
||||
@@ -309,81 +309,6 @@
|
||||
'<(DEPTH)/third_party/expat/expat.gyp:expat',
|
||||
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
|
||||
],
|
||||
'sources': [
|
||||
'xmpp/asyncsocket.h',
|
||||
'xmpp/chatroommodule.h',
|
||||
'xmpp/chatroommoduleimpl.cc',
|
||||
'xmpp/constants.cc',
|
||||
'xmpp/constants.h',
|
||||
'xmpp/discoitemsquerytask.cc',
|
||||
'xmpp/discoitemsquerytask.h',
|
||||
'xmpp/hangoutpubsubclient.cc',
|
||||
'xmpp/hangoutpubsubclient.h',
|
||||
'xmpp/iqtask.cc',
|
||||
'xmpp/iqtask.h',
|
||||
'xmpp/jid.cc',
|
||||
'xmpp/jid.h',
|
||||
'xmpp/module.h',
|
||||
'xmpp/moduleimpl.cc',
|
||||
'xmpp/moduleimpl.h',
|
||||
'xmpp/mucroomconfigtask.cc',
|
||||
'xmpp/mucroomconfigtask.h',
|
||||
'xmpp/mucroomdiscoverytask.cc',
|
||||
'xmpp/mucroomdiscoverytask.h',
|
||||
'xmpp/mucroomlookuptask.cc',
|
||||
'xmpp/mucroomlookuptask.h',
|
||||
'xmpp/mucroomuniquehangoutidtask.cc',
|
||||
'xmpp/mucroomuniquehangoutidtask.h',
|
||||
'xmpp/pingtask.cc',
|
||||
'xmpp/pingtask.h',
|
||||
'xmpp/plainsaslhandler.h',
|
||||
'xmpp/presenceouttask.cc',
|
||||
'xmpp/presenceouttask.h',
|
||||
'xmpp/presencereceivetask.cc',
|
||||
'xmpp/presencereceivetask.h',
|
||||
'xmpp/presencestatus.cc',
|
||||
'xmpp/presencestatus.h',
|
||||
'xmpp/prexmppauth.h',
|
||||
'xmpp/pubsub_task.cc',
|
||||
'xmpp/pubsub_task.h',
|
||||
'xmpp/pubsubclient.cc',
|
||||
'xmpp/pubsubclient.h',
|
||||
'xmpp/pubsubstateclient.cc',
|
||||
'xmpp/pubsubstateclient.h',
|
||||
'xmpp/pubsubtasks.cc',
|
||||
'xmpp/pubsubtasks.h',
|
||||
'xmpp/receivetask.cc',
|
||||
'xmpp/receivetask.h',
|
||||
'xmpp/rostermodule.h',
|
||||
'xmpp/rostermoduleimpl.cc',
|
||||
'xmpp/rostermoduleimpl.h',
|
||||
'xmpp/saslcookiemechanism.h',
|
||||
'xmpp/saslhandler.h',
|
||||
'xmpp/saslmechanism.cc',
|
||||
'xmpp/saslmechanism.h',
|
||||
'xmpp/saslplainmechanism.h',
|
||||
'xmpp/xmppauth.cc',
|
||||
'xmpp/xmppauth.h',
|
||||
'xmpp/xmppclient.cc',
|
||||
'xmpp/xmppclient.h',
|
||||
'xmpp/xmppclientsettings.h',
|
||||
'xmpp/xmppengine.h',
|
||||
'xmpp/xmppengineimpl.cc',
|
||||
'xmpp/xmppengineimpl.h',
|
||||
'xmpp/xmppengineimpl_iq.cc',
|
||||
'xmpp/xmpplogintask.cc',
|
||||
'xmpp/xmpplogintask.h',
|
||||
'xmpp/xmpppump.cc',
|
||||
'xmpp/xmpppump.h',
|
||||
'xmpp/xmppsocket.cc',
|
||||
'xmpp/xmppsocket.h',
|
||||
'xmpp/xmppstanzaparser.cc',
|
||||
'xmpp/xmppstanzaparser.h',
|
||||
'xmpp/xmpptask.cc',
|
||||
'xmpp/xmpptask.h',
|
||||
'xmpp/xmppthread.cc',
|
||||
'xmpp/xmppthread.h',
|
||||
],
|
||||
}, # target libjingle
|
||||
{
|
||||
'target_name': 'libjingle_media',
|
||||
@@ -403,6 +328,8 @@
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
|
||||
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers_default',
|
||||
'<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
|
||||
'<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
|
||||
'<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
|
||||
'libjingle',
|
||||
],
|
||||
'direct_dependent_settings': {
|
||||
@@ -628,90 +555,6 @@
|
||||
],
|
||||
},
|
||||
'sources': [
|
||||
'p2p/base/asyncstuntcpsocket.cc',
|
||||
'p2p/base/asyncstuntcpsocket.h',
|
||||
'p2p/base/basicpacketsocketfactory.cc',
|
||||
'p2p/base/basicpacketsocketfactory.h',
|
||||
'p2p/base/candidate.h',
|
||||
'p2p/base/common.h',
|
||||
'p2p/base/constants.cc',
|
||||
'p2p/base/constants.h',
|
||||
'p2p/base/dtlstransportchannel.cc',
|
||||
'p2p/base/dtlstransportchannel.h',
|
||||
'p2p/base/p2ptransport.cc',
|
||||
'p2p/base/p2ptransport.h',
|
||||
'p2p/base/p2ptransportchannel.cc',
|
||||
'p2p/base/p2ptransportchannel.h',
|
||||
'p2p/base/packetsocketfactory.h',
|
||||
'p2p/base/parsing.cc',
|
||||
'p2p/base/parsing.h',
|
||||
'p2p/base/port.cc',
|
||||
'p2p/base/port.h',
|
||||
'p2p/base/portallocator.cc',
|
||||
'p2p/base/portallocator.h',
|
||||
'p2p/base/portallocatorsessionproxy.cc',
|
||||
'p2p/base/portallocatorsessionproxy.h',
|
||||
'p2p/base/portinterface.h',
|
||||
'p2p/base/portproxy.cc',
|
||||
'p2p/base/portproxy.h',
|
||||
'p2p/base/pseudotcp.cc',
|
||||
'p2p/base/pseudotcp.h',
|
||||
'p2p/base/rawtransport.cc',
|
||||
'p2p/base/rawtransport.h',
|
||||
'p2p/base/rawtransportchannel.cc',
|
||||
'p2p/base/rawtransportchannel.h',
|
||||
'p2p/base/relayport.cc',
|
||||
'p2p/base/relayport.h',
|
||||
'p2p/base/relayserver.cc',
|
||||
'p2p/base/relayserver.h',
|
||||
'p2p/base/session.cc',
|
||||
'p2p/base/session.h',
|
||||
'p2p/base/sessionclient.h',
|
||||
'p2p/base/sessiondescription.cc',
|
||||
'p2p/base/sessiondescription.h',
|
||||
'p2p/base/sessionid.h',
|
||||
'p2p/base/sessionmanager.cc',
|
||||
'p2p/base/sessionmanager.h',
|
||||
'p2p/base/sessionmessages.cc',
|
||||
'p2p/base/sessionmessages.h',
|
||||
'p2p/base/stun.cc',
|
||||
'p2p/base/stun.h',
|
||||
'p2p/base/stunport.cc',
|
||||
'p2p/base/stunport.h',
|
||||
'p2p/base/stunrequest.cc',
|
||||
'p2p/base/stunrequest.h',
|
||||
'p2p/base/stunserver.cc',
|
||||
'p2p/base/stunserver.h',
|
||||
'p2p/base/tcpport.cc',
|
||||
'p2p/base/tcpport.h',
|
||||
'p2p/base/transport.cc',
|
||||
'p2p/base/transport.h',
|
||||
'p2p/base/transportchannel.cc',
|
||||
'p2p/base/transportchannel.h',
|
||||
'p2p/base/transportchannelimpl.h',
|
||||
'p2p/base/transportchannelproxy.cc',
|
||||
'p2p/base/transportchannelproxy.h',
|
||||
'p2p/base/transportdescription.cc',
|
||||
'p2p/base/transportdescription.h',
|
||||
'p2p/base/transportdescriptionfactory.cc',
|
||||
'p2p/base/transportdescriptionfactory.h',
|
||||
'p2p/base/transportinfo.h',
|
||||
'p2p/base/turnport.cc',
|
||||
'p2p/base/turnport.h',
|
||||
'p2p/base/turnserver.cc',
|
||||
'p2p/base/turnserver.h',
|
||||
'p2p/base/udpport.h',
|
||||
'p2p/client/autoportallocator.h',
|
||||
'p2p/client/basicportallocator.cc',
|
||||
'p2p/client/basicportallocator.h',
|
||||
'p2p/client/connectivitychecker.cc',
|
||||
'p2p/client/connectivitychecker.h',
|
||||
'p2p/client/httpportallocator.cc',
|
||||
'p2p/client/httpportallocator.h',
|
||||
'p2p/client/sessionmanagertask.h',
|
||||
'p2p/client/sessionsendtask.h',
|
||||
'p2p/client/socketmonitor.cc',
|
||||
'p2p/client/socketmonitor.h',
|
||||
'session/tunnel/pseudotcpchannel.cc',
|
||||
'session/tunnel/pseudotcpchannel.h',
|
||||
'session/tunnel/tunnelsessionclient.cc',
|
||||
|
||||
Reference in New Issue
Block a user