From 7fb5d46d3aa340f14522a359e8706358f0ed874f Mon Sep 17 00:00:00 2001
From: "andrew@webrtc.org"
 <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 9 Dec 2011 03:31:41 +0000
Subject: [PATCH] Give peerconnection its own gyp and disable.

r1140 broke the libjingle revision we're pulling. The fix in libjingle
is pending; rather than reverting r1140, this temporarily disables
peerconnection in the default build.

TBR=tommi@webrtc.org
TEST=build

Review URL: http://webrtc-codereview.appspot.com/323002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1141 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 peerconnection/peerconnection.gyp | 103 ++++++++++++++++++++++++++++++
 webrtc.gyp                        |  95 +--------------------------
 2 files changed, 106 insertions(+), 92 deletions(-)
 create mode 100644 peerconnection/peerconnection.gyp

diff --git a/peerconnection/peerconnection.gyp b/peerconnection/peerconnection.gyp
new file mode 100644
index 0000000000..12cd3892d1
--- /dev/null
+++ b/peerconnection/peerconnection.gyp
@@ -0,0 +1,103 @@
+# Copyright (c) 2011 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': [ '../src/build/common.gypi', ],
+  'targets': [
+    {
+      'target_name': 'peerconnection_server',
+      'type': 'executable',
+      'sources': [
+        'samples/server/data_socket.cc',
+        'samples/server/data_socket.h',
+        'samples/server/main.cc',
+        'samples/server/peer_channel.cc',
+        'samples/server/peer_channel.h',
+        'samples/server/utils.cc',
+        'samples/server/utils.h',
+      ],
+    },
+  ],
+  'conditions': [
+    ['OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'peerconnection_client',
+          'type': 'executable',
+          'sources': [
+            'samples/client/conductor.cc',
+            'samples/client/conductor.h',
+            'samples/client/defaults.cc',
+            'samples/client/defaults.h',
+            'samples/client/main.cc',
+            'samples/client/main_wnd.cc',
+            'samples/client/main_wnd.h',
+            'samples/client/peer_connection_client.cc',
+            'samples/client/peer_connection_client.h',
+            'third_party/libjingle/source/talk/base/win32socketinit.cc',
+            'third_party/libjingle/source/talk/base/win32socketserver.cc',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+             'SubSystem': '2',  # Windows
+            },
+          },
+          'dependencies': [
+            '../third_party_mods/libjingle/libjingle.gyp:libjingle_app',
+          ],
+          'include_dirs': [
+            '../third_party/libjingle/source',
+            '../third_party_mods/libjingle/source',
+          ],
+        },
+      ],  # targets
+    }, ],  # OS="win"
+    ['OS=="linux"', {
+      'targets': [
+        {
+          'target_name': 'peerconnection_client',
+          'type': 'executable',
+          'sources': [
+            'samples/client/conductor.cc',
+            'samples/client/conductor.h',
+            'samples/client/defaults.cc',
+            'samples/client/defaults.h',
+            'samples/client/linux/main.cc',
+            'samples/client/linux/main_wnd.cc',
+            'samples/client/linux/main_wnd.h',
+            'samples/client/peer_connection_client.cc',
+            'samples/client/peer_connection_client.h',
+          ],
+          'dependencies': [
+            '../third_party_mods/libjingle/libjingle.gyp:libjingle_app',
+            # TODO(tommi): Switch to this and remove specific gtk dependency
+            # sections below for cflags and link_settings.
+            # '<(DEPTH)/build/linux/system.gyp:gtk',
+          ],
+          'include_dirs': [
+            '../third_party/libjingle/source',
+            '../third_party_mods/libjingle/source',
+          ],
+          'cflags': [
+            '<!@(pkg-config --cflags gtk+-2.0)',
+          ],
+          'link_settings': {
+            'ldflags': [
+              '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
+            ],
+            'libraries': [
+              '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
+              '-lX11',
+              '-lXext',
+            ],
+          },
+        },
+      ],  # targets
+    }, ],  # OS="linux"
+  ],
+}
diff --git a/webrtc.gyp b/webrtc.gyp
index 90ca0b736b..b94f4b7eac 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -7,14 +7,14 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': [
-    'src/build/common.gypi',
-  ],
+  'includes': [ 'src/build/common.gypi', ],
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
+        # TODO(andrew): re-enable when libjingle is rolled.
+        #'peerconnection/peerconnection.gyp:*',
         'src/common_audio/common_audio.gyp:*',
         'src/common_video/common_video.gyp:*',
         'src/modules/modules.gyp:*',
@@ -24,20 +24,6 @@
         'test/test.gyp:*',
       ],
     },
-    # TODO(andrew): move peerconnection to its own gyp.
-    {
-      'target_name': 'peerconnection_server',
-      'type': 'executable',
-      'sources': [
-        'peerconnection/samples/server/data_socket.cc',
-        'peerconnection/samples/server/data_socket.h',
-        'peerconnection/samples/server/main.cc',
-        'peerconnection/samples/server/peer_channel.cc',
-        'peerconnection/samples/server/peer_channel.h',
-        'peerconnection/samples/server/utils.cc',
-        'peerconnection/samples/server/utils.h',
-      ],
-    },
   ],
   'conditions': [
     ['build_with_chromium==1', {
@@ -46,80 +32,5 @@
         'WEBRTC_CHROMIUM_BUILD',
       ],
     }, ],  # build_with_chromium=1
-    ['OS=="win"', {
-      'targets': [
-        {
-          'target_name': 'peerconnection_client',
-          'type': 'executable',
-          'sources': [
-            'peerconnection/samples/client/conductor.cc',
-            'peerconnection/samples/client/conductor.h',
-            'peerconnection/samples/client/defaults.cc',
-            'peerconnection/samples/client/defaults.h',
-            'peerconnection/samples/client/main.cc',
-            'peerconnection/samples/client/main_wnd.cc',
-            'peerconnection/samples/client/main_wnd.h',
-            'peerconnection/samples/client/peer_connection_client.cc',
-            'peerconnection/samples/client/peer_connection_client.h',
-            'third_party/libjingle/source/talk/base/win32socketinit.cc',
-            'third_party/libjingle/source/talk/base/win32socketserver.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-             'SubSystem': '2',  # Windows
-            },
-          },
-          'dependencies': [
-            'third_party_mods/libjingle/libjingle.gyp:libjingle_app',
-          ],
-          'include_dirs': [
-            'third_party/libjingle/source',
-            'third_party_mods/libjingle/source',
-          ],
-        },
-      ],  # targets
-    }, ],  # OS="win"
-    ['OS=="linux"', {
-      'targets': [
-        {
-          'target_name': 'peerconnection_client',
-          'type': 'executable',
-          'sources': [
-            'peerconnection/samples/client/conductor.cc',
-            'peerconnection/samples/client/conductor.h',
-            'peerconnection/samples/client/defaults.cc',
-            'peerconnection/samples/client/defaults.h',
-            'peerconnection/samples/client/linux/main.cc',
-            'peerconnection/samples/client/linux/main_wnd.cc',
-            'peerconnection/samples/client/linux/main_wnd.h',
-            'peerconnection/samples/client/peer_connection_client.cc',
-            'peerconnection/samples/client/peer_connection_client.h',
-          ],
-          'dependencies': [
-            'third_party_mods/libjingle/libjingle.gyp:libjingle_app',
-            # TODO(tommi): Switch to this and remove specific gtk dependency
-            # sections below for cflags and link_settings.
-            # '<(DEPTH)/build/linux/system.gyp:gtk',
-          ],
-          'include_dirs': [
-            'third_party/libjingle/source',
-            'third_party_mods/libjingle/source',
-          ],
-          'cflags': [
-            '<!@(pkg-config --cflags gtk+-2.0)',
-          ],
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
-              '-lX11',
-              '-lXext',
-            ],
-          },
-        },
-      ],  # targets
-    }, ],  # OS="linux"
   ],  # conditions
 }