From bc03192560a591ad33c84c707f43710d98e330a3 Mon Sep 17 00:00:00 2001
From: "pthatcher@webrtc.org" <pthatcher@webrtc.org>
Date: Wed, 17 Dec 2014 22:15:11 +0000
Subject: [PATCH] Move jingle examples from talk/ into webrtc/libjingle.  This
 is part of the effor to move Jingle out of WebRTC and into its own
 repository.

R=juberti@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/32849004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7936 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/libjingle_examples.gyp                   | 60 ------------
 .../libjingle}/examples/call/Info.plist       |  0
 .../libjingle}/examples/call/call_main.cc     |  2 +-
 .../libjingle}/examples/call/call_unittest.cc |  0
 .../libjingle}/examples/call/callclient.cc    |  6 +-
 .../libjingle}/examples/call/callclient.h     |  4 +-
 .../examples/call/callclient_unittest.cc      |  0
 .../libjingle}/examples/call/console.cc       |  0
 .../libjingle}/examples/call/console.h        |  0
 .../examples/call/friendinvitesendtask.cc     |  0
 .../examples/call/friendinvitesendtask.h      |  0
 .../examples/call/mediaenginefactory.cc       |  0
 .../examples/call/mediaenginefactory.h        |  0
 .../libjingle}/examples/call/muc.h            |  0
 .../examples/call/mucinviterecvtask.cc        |  0
 .../examples/call/mucinviterecvtask.h         |  0
 .../examples/call/mucinvitesendtask.cc        |  0
 .../examples/call/mucinvitesendtask.h         |  0
 .../examples/call/presencepushtask.cc         |  0
 .../examples/call/presencepushtask.h          |  0
 .../libjingle}/examples/login/login_main.cc   |  0
 webrtc/libjingle/libjingle.gyp                | 92 +++++++++++++++++++
 22 files changed, 98 insertions(+), 66 deletions(-)
 rename {talk => webrtc/libjingle}/examples/call/Info.plist (100%)
 rename {talk => webrtc/libjingle}/examples/call/call_main.cc (99%)
 rename {talk => webrtc/libjingle}/examples/call/call_unittest.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/callclient.cc (99%)
 rename {talk => webrtc/libjingle}/examples/call/callclient.h (99%)
 rename {talk => webrtc/libjingle}/examples/call/callclient_unittest.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/console.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/console.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/friendinvitesendtask.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/friendinvitesendtask.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/mediaenginefactory.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/mediaenginefactory.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/muc.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/mucinviterecvtask.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/mucinviterecvtask.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/mucinvitesendtask.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/mucinvitesendtask.h (100%)
 rename {talk => webrtc/libjingle}/examples/call/presencepushtask.cc (100%)
 rename {talk => webrtc/libjingle}/examples/call/presencepushtask.h (100%)
 rename {talk => webrtc/libjingle}/examples/login/login_main.cc (100%)
 create mode 100644 webrtc/libjingle/libjingle.gyp

diff --git a/talk/libjingle_examples.gyp b/talk/libjingle_examples.gyp
index 75bc2f7ca0..ec9e4dcca3 100755
--- a/talk/libjingle_examples.gyp
+++ b/talk/libjingle_examples.gyp
@@ -76,16 +76,6 @@
         'examples/turnserver/turnserver_main.cc',
       ],
     },  # target turnserver
-    {
-      'target_name': 'login',
-      'type': 'executable',
-      'dependencies': [
-        'libjingle_xmpphelp',
-      ],
-      'sources': [
-        'examples/login/login_main.cc',
-      ],
-    },  # target login
     {
       'target_name': 'peerconnection_server',
       'type': 'executable',
@@ -106,56 +96,6 @@
     }, # target peerconnection_server
   ],
   'conditions': [
-    # TODO(ronghuawu): Reenable building call.
-    # ['OS!="android"', {
-    #   'targets': [
-    #     {
-    #       'target_name': 'call',
-    #       'type': 'executable',
-    #       'dependencies': [
-    #         'libjingle.gyp:libjingle_p2p',
-    #         'libjingle_xmpphelp',
-    #       ],
-    #       'sources': [
-    #         'examples/call/call_main.cc',
-    #         'examples/call/callclient.cc',
-    #         'examples/call/callclient.h',
-    #         'examples/call/console.cc',
-    #         'examples/call/console.h',
-    #         'examples/call/friendinvitesendtask.cc',
-    #         'examples/call/friendinvitesendtask.h',
-    #         'examples/call/mediaenginefactory.cc',
-    #         'examples/call/mediaenginefactory.h',
-    #         'examples/call/muc.h',
-    #         'examples/call/mucinviterecvtask.cc',
-    #         'examples/call/mucinviterecvtask.h',
-    #         'examples/call/mucinvitesendtask.cc',
-    #         'examples/call/mucinvitesendtask.h',
-    #         'examples/call/presencepushtask.cc',
-    #         'examples/call/presencepushtask.h',
-    #       ],
-    #       'conditions': [
-    #         ['OS=="linux"', {
-    #           'link_settings': {
-    #             'libraries': [
-    #               '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
-    #                   ' gtk+-2.0)',
-    #             ],
-    #           },
-    #         }],
-    #         ['OS=="win"', {
-    #           'msvs_settings': {
-    #             'VCLinkerTool': {
-    #               'AdditionalDependencies': [
-    #                 'strmiids.lib',
-    #               ],
-    #             },
-    #           },
-    #         }],
-    #       ],  # conditions
-    #     },  # target call
-    #   ], # targets
-    # }],  # OS!="android"
     ['OS=="linux" or OS=="win"', {
       'targets': [
         {
diff --git a/talk/examples/call/Info.plist b/webrtc/libjingle/examples/call/Info.plist
similarity index 100%
rename from talk/examples/call/Info.plist
rename to webrtc/libjingle/examples/call/Info.plist
diff --git a/talk/examples/call/call_main.cc b/webrtc/libjingle/examples/call/call_main.cc
similarity index 99%
rename from talk/examples/call/call_main.cc
rename to webrtc/libjingle/examples/call/call_main.cc
index 638f6f94c4..7cdea85f06 100644
--- a/talk/examples/call/call_main.cc
+++ b/webrtc/libjingle/examples/call/call_main.cc
@@ -42,7 +42,7 @@
 #include "talk/examples/call/console.h"
 #include "talk/examples/call/mediaenginefactory.h"
 #include "webrtc/p2p/base/constants.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/media/mediasessionclient.h"
 #include "talk/session/media/srtpfilter.h"
 #include "webrtc/libjingle/xmpp/xmppauth.h"
 #include "webrtc/libjingle/xmpp/xmppclientsettings.h"
diff --git a/talk/examples/call/call_unittest.cc b/webrtc/libjingle/examples/call/call_unittest.cc
similarity index 100%
rename from talk/examples/call/call_unittest.cc
rename to webrtc/libjingle/examples/call/call_unittest.cc
diff --git a/talk/examples/call/callclient.cc b/webrtc/libjingle/examples/call/callclient.cc
similarity index 99%
rename from talk/examples/call/callclient.cc
rename to webrtc/libjingle/examples/call/callclient.cc
index 866133e077..6eae983a88 100644
--- a/talk/examples/call/callclient.cc
+++ b/webrtc/libjingle/examples/call/callclient.cc
@@ -53,11 +53,11 @@
 #include "talk/media/base/videorenderer.h"
 #include "talk/media/devices/devicemanager.h"
 #include "talk/media/devices/videorendererfactory.h"
-#include "webrtc/p2p/base/sessionmanager.h"
+#include "webrtc/libjingle/session/sessionmanager.h"
 #include "webrtc/p2p/client/basicportallocator.h"
 #include "webrtc/p2p/client/sessionmanagertask.h"
-#include "talk/session/media/mediamessages.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/media/mediamessages.h"
+#include "webrtc/libjingle/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
 #include "webrtc/libjingle/xmpp/mucroomconfigtask.h"
diff --git a/talk/examples/call/callclient.h b/webrtc/libjingle/examples/call/callclient.h
similarity index 99%
rename from talk/examples/call/callclient.h
rename to webrtc/libjingle/examples/call/callclient.h
index 075dc6efd8..ac427b4721 100644
--- a/talk/examples/call/callclient.h
+++ b/webrtc/libjingle/examples/call/callclient.h
@@ -35,8 +35,8 @@
 #include "talk/examples/call/console.h"
 #include "talk/media/base/mediachannel.h"
 #include "webrtc/p2p/base/session.h"
-#include "talk/session/media/mediamessages.h"
-#include "talk/session/media/mediasessionclient.h"
+#include "webrtc/libjingle/media/mediamessages.h"
+#include "webrtc/libjingle/media/mediasessionclient.h"
 #include "webrtc/libjingle/xmpp/hangoutpubsubclient.h"
 #include "webrtc/libjingle/xmpp/presencestatus.h"
 #include "webrtc/libjingle/xmpp/xmppclient.h"
diff --git a/talk/examples/call/callclient_unittest.cc b/webrtc/libjingle/examples/call/callclient_unittest.cc
similarity index 100%
rename from talk/examples/call/callclient_unittest.cc
rename to webrtc/libjingle/examples/call/callclient_unittest.cc
diff --git a/talk/examples/call/console.cc b/webrtc/libjingle/examples/call/console.cc
similarity index 100%
rename from talk/examples/call/console.cc
rename to webrtc/libjingle/examples/call/console.cc
diff --git a/talk/examples/call/console.h b/webrtc/libjingle/examples/call/console.h
similarity index 100%
rename from talk/examples/call/console.h
rename to webrtc/libjingle/examples/call/console.h
diff --git a/talk/examples/call/friendinvitesendtask.cc b/webrtc/libjingle/examples/call/friendinvitesendtask.cc
similarity index 100%
rename from talk/examples/call/friendinvitesendtask.cc
rename to webrtc/libjingle/examples/call/friendinvitesendtask.cc
diff --git a/talk/examples/call/friendinvitesendtask.h b/webrtc/libjingle/examples/call/friendinvitesendtask.h
similarity index 100%
rename from talk/examples/call/friendinvitesendtask.h
rename to webrtc/libjingle/examples/call/friendinvitesendtask.h
diff --git a/talk/examples/call/mediaenginefactory.cc b/webrtc/libjingle/examples/call/mediaenginefactory.cc
similarity index 100%
rename from talk/examples/call/mediaenginefactory.cc
rename to webrtc/libjingle/examples/call/mediaenginefactory.cc
diff --git a/talk/examples/call/mediaenginefactory.h b/webrtc/libjingle/examples/call/mediaenginefactory.h
similarity index 100%
rename from talk/examples/call/mediaenginefactory.h
rename to webrtc/libjingle/examples/call/mediaenginefactory.h
diff --git a/talk/examples/call/muc.h b/webrtc/libjingle/examples/call/muc.h
similarity index 100%
rename from talk/examples/call/muc.h
rename to webrtc/libjingle/examples/call/muc.h
diff --git a/talk/examples/call/mucinviterecvtask.cc b/webrtc/libjingle/examples/call/mucinviterecvtask.cc
similarity index 100%
rename from talk/examples/call/mucinviterecvtask.cc
rename to webrtc/libjingle/examples/call/mucinviterecvtask.cc
diff --git a/talk/examples/call/mucinviterecvtask.h b/webrtc/libjingle/examples/call/mucinviterecvtask.h
similarity index 100%
rename from talk/examples/call/mucinviterecvtask.h
rename to webrtc/libjingle/examples/call/mucinviterecvtask.h
diff --git a/talk/examples/call/mucinvitesendtask.cc b/webrtc/libjingle/examples/call/mucinvitesendtask.cc
similarity index 100%
rename from talk/examples/call/mucinvitesendtask.cc
rename to webrtc/libjingle/examples/call/mucinvitesendtask.cc
diff --git a/talk/examples/call/mucinvitesendtask.h b/webrtc/libjingle/examples/call/mucinvitesendtask.h
similarity index 100%
rename from talk/examples/call/mucinvitesendtask.h
rename to webrtc/libjingle/examples/call/mucinvitesendtask.h
diff --git a/talk/examples/call/presencepushtask.cc b/webrtc/libjingle/examples/call/presencepushtask.cc
similarity index 100%
rename from talk/examples/call/presencepushtask.cc
rename to webrtc/libjingle/examples/call/presencepushtask.cc
diff --git a/talk/examples/call/presencepushtask.h b/webrtc/libjingle/examples/call/presencepushtask.h
similarity index 100%
rename from talk/examples/call/presencepushtask.h
rename to webrtc/libjingle/examples/call/presencepushtask.h
diff --git a/talk/examples/login/login_main.cc b/webrtc/libjingle/examples/login/login_main.cc
similarity index 100%
rename from talk/examples/login/login_main.cc
rename to webrtc/libjingle/examples/login/login_main.cc
diff --git a/webrtc/libjingle/libjingle.gyp b/webrtc/libjingle/libjingle.gyp
new file mode 100644
index 0000000000..42b9992920
--- /dev/null
+++ b/webrtc/libjingle/libjingle.gyp
@@ -0,0 +1,92 @@
+# Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+{
+  'includes': ['../build/common.gypi'],
+  'variables': {
+    'talk_root%': '<(webrtc_root)/../talk',
+  },
+  'targets': [
+    {
+      'target_name': 'libjingle_xmpphelp',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/third_party/expat/expat.gyp:expat',
+        '<(talk_root)/libjingle.gyp:libjingle',
+        '<(talk_root)/libjingle.gyp:libjingle_p2p',
+      ],
+      'sources': [
+        'xmpp/jingleinfotask.cc',
+        'xmpp/jingleinfotask.h',
+      ],
+    },  # target libjingle_xmpphelp
+    {
+      'target_name': 'login',
+      'type': 'executable',
+      'dependencies': [
+        'libjingle_xmpphelp',
+        '<(talk_root)/libjingle.gyp:libjingle',
+      ],
+      'sources': [
+        'examples/login/login_main.cc',
+      ],
+    },  # target login
+  ],
+  'conditions': [
+    # TODO(ronghuawu): Reenable building call.
+    # ['OS!="android"', {
+    #   'targets': [
+    #     {
+    #       'target_name': 'call',
+    #       'type': 'executable',
+    #       'dependencies': [
+    #         'libjingle.gyp:libjingle_p2p',
+    #         'libjingle_xmpphelp',
+    #       ],
+    #       'sources': [
+    #         'examples/call/call_main.cc',
+    #         'examples/call/callclient.cc',
+    #         'examples/call/callclient.h',
+    #         'examples/call/console.cc',
+    #         'examples/call/console.h',
+    #         'examples/call/friendinvitesendtask.cc',
+    #         'examples/call/friendinvitesendtask.h',
+    #         'examples/call/mediaenginefactory.cc',
+    #         'examples/call/mediaenginefactory.h',
+    #         'examples/call/muc.h',
+    #         'examples/call/mucinviterecvtask.cc',
+    #         'examples/call/mucinviterecvtask.h',
+    #         'examples/call/mucinvitesendtask.cc',
+    #         'examples/call/mucinvitesendtask.h',
+    #         'examples/call/presencepushtask.cc',
+    #         'examples/call/presencepushtask.h',
+    #       ],
+    #       'conditions': [
+    #         ['OS=="linux"', {
+    #           'link_settings': {
+    #             'libraries': [
+    #               '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
+    #                   ' gtk+-2.0)',
+    #             ],
+    #           },
+    #         }],
+    #         ['OS=="win"', {
+    #           'msvs_settings': {
+    #             'VCLinkerTool': {
+    #               'AdditionalDependencies': [
+    #                 'strmiids.lib',
+    #               ],
+    #             },
+    #           },
+    #         }],
+    #       ],  # conditions
+    #     },  # target call
+    #   ], # targets
+    # }],  # OS!="android"
+  ],
+}