Add peerconnection_all.gyp to include everything.

Add a dummy peerconnection_client target for mac so that we don't get an error when doing runhooks.
Review URL: https://webrtc-codereview.appspot.com/855005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2865 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2012-10-03 16:35:45 +00:00
parent 60ac6a642a
commit 2e5192fa6a
4 changed files with 43 additions and 1 deletions

View File

@ -101,10 +101,19 @@ hooks = [
"pattern": ".",
"action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
},
{
# Update the cygwin mount on Windows.
# This is necessary to get the correct mapping between e.g. /bin and the
# cygwin path on Windows. Without it we can't run bash scripts in actions.
# Ideally this should be solved in "pylib/gyp/msvs_emulation.py".
"pattern": ".",
"action": ["python", "trunk/build/win/setup_cygwin_mount.py",
"--win-only"],
},
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/peerconnection.gyp"],
"action": ["python", "trunk/build/gyp_chromium", "--depth=trunk", "trunk/peerconnection_all.gyp"],
},
]

View File

@ -12,6 +12,7 @@
'peerconnection_sample': 'third_party/libjingle/source/talk/examples/peerconnection',
},
'conditions': [
# TODO(wu): Merge the target for different platforms.
['OS=="win"', {
'targets': [
{
@ -89,5 +90,16 @@
},
], # targets
}, ], # OS="linux"
# There's no peerconnection_client implementation for Mac.
# But add this dummy peerconnection_client target so that the runhooks
# won't complain.
['OS=="mac"', {
'targets': [
{
'target_name': 'peerconnection_client',
'type': 'none',
},
],
}, ],
],
}

View File

@ -0,0 +1,20 @@
# Copyright (c) 2012 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.
{
'targets': [
{
'target_name': 'All',
'type': 'none',
'dependencies': [
'peerconnection.gyp:*',
'third_party/libjingle/libjingle.gyp:*',
],
},
],
}

View File

@ -2,6 +2,7 @@
{
'variables': {
'build_with_chromium': 1,
'clang_use_chrome_plugins': 0,
'enable_protobuf': 1,
'enabled_libjingle_device_manager': 1,
'include_internal_audio_device': 1,