PeerConnection client and server can now be built from libjingle trunk. So we no longer need this folder. The getting-started page has also been updated.
TEST=n/a BUG= Review URL: https://webrtc-codereview.appspot.com/1057005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3573 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
parent
dd5482cd2f
commit
ff0cd88e3d
@ -1,123 +0,0 @@
|
|||||||
vars = {
|
|
||||||
# Use this googlecode_url variable only if there is an internal mirror for it.
|
|
||||||
# If you do not know, use the full path while defining your new deps entry.
|
|
||||||
"googlecode_url": "http://%s.googlecode.com/svn",
|
|
||||||
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
|
|
||||||
"chromium_revision": "162524",
|
|
||||||
# Still needs the libjingle_revision here because some of
|
|
||||||
# the deps have to be pulled from libjingle repository.
|
|
||||||
"libjingle_revision": "204",
|
|
||||||
}
|
|
||||||
|
|
||||||
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
|
|
||||||
# https; the latter can cause problems for users behind proxies.
|
|
||||||
deps = {
|
|
||||||
"trunk/chromium_deps":
|
|
||||||
File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
|
|
||||||
|
|
||||||
"trunk/third_party/webrtc":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/webrtc"),
|
|
||||||
|
|
||||||
# WebRTC deps.
|
|
||||||
"trunk/third_party/libvpx":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/libvpx"),
|
|
||||||
|
|
||||||
"trunk/build":
|
|
||||||
Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
# Needed by common.gypi.
|
|
||||||
"trunk/google_apis/build":
|
|
||||||
Var("chromium_trunk") + "/src/google_apis/build@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/testing/gtest":
|
|
||||||
From("trunk/chromium_deps", "src/testing/gtest"),
|
|
||||||
|
|
||||||
"trunk/tools/gyp":
|
|
||||||
From("trunk/chromium_deps", "src/tools/gyp"),
|
|
||||||
|
|
||||||
"trunk/tools/clang":
|
|
||||||
Var("chromium_trunk") + "/src/tools/clang@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
# Needed by build/common.gypi.
|
|
||||||
"trunk/tools/win/supalink":
|
|
||||||
Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/protobuf":
|
|
||||||
Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/libjpeg_turbo/":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"),
|
|
||||||
|
|
||||||
"trunk/third_party/libjpeg":
|
|
||||||
Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/yasm":
|
|
||||||
Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/expat":
|
|
||||||
Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/yasm/source/patched-yasm":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"),
|
|
||||||
|
|
||||||
"trunk/third_party/libyuv":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/libyuv"),
|
|
||||||
|
|
||||||
# libjingle deps.
|
|
||||||
"trunk/third_party/libjingle/":
|
|
||||||
File(Var("chromium_trunk") + "/src/third_party/libjingle/libjingle.gyp@" + Var("chromium_revision")),
|
|
||||||
|
|
||||||
"trunk/third_party/libjingle/source":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/libjingle/source"),
|
|
||||||
|
|
||||||
"trunk/third_party/libjingle/overrides/talk/base":
|
|
||||||
(Var("googlecode_url") % "libjingle") + "/trunk/talk/base@" + Var("libjingle_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/libsrtp/":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/libsrtp"),
|
|
||||||
|
|
||||||
"trunk/third_party/jsoncpp/":
|
|
||||||
Var("chromium_trunk") + "/src/third_party/jsoncpp@" + Var("chromium_revision"),
|
|
||||||
|
|
||||||
"trunk/third_party/jsoncpp/source":
|
|
||||||
"http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@248",
|
|
||||||
}
|
|
||||||
|
|
||||||
deps_os = {
|
|
||||||
"win": {
|
|
||||||
"trunk/third_party/cygwin/":
|
|
||||||
Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
|
|
||||||
|
|
||||||
# Used by libjpeg-turbo
|
|
||||||
"trunk/third_party/yasm/binaries":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/yasm/binaries"),
|
|
||||||
},
|
|
||||||
"unix": {
|
|
||||||
"trunk/third_party/gold":
|
|
||||||
From("trunk/chromium_deps", "src/third_party/gold"),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
hooks = [
|
|
||||||
{
|
|
||||||
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
|
||||||
# zero seconds to run. If something changed, it downloads a prebuilt clang.
|
|
||||||
"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_all.gyp"],
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
henrike@webrtc.org
|
|
||||||
mallinath@webrtc.org
|
|
||||||
perkj@webrtc.org
|
|
||||||
wu@webrtc.org
|
|
||||||
tommi@webrtc.org
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
This folder can be used to pull together the chromium version of webrtc
|
|
||||||
and libjingle, and build the peerconnection sample client and server. This will
|
|
||||||
check out a new repository in which you can build peerconnection_server.
|
|
||||||
|
|
||||||
Steps:
|
|
||||||
1) Create a new directory for the new repository (outside the webrtc repo):
|
|
||||||
mkdir peerconnection
|
|
||||||
cd peerconnection
|
|
||||||
2) gclient config --name trunk http://webrtc.googlecode.com/svn/trunk/peerconnection
|
|
||||||
3) gclient sync
|
|
||||||
4) cd trunk
|
|
||||||
5) make peerconnection_server peerconnection_client
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
# Below are normally provided by Chromium's base.gyp and required for
|
|
||||||
# libjingle.gyp.
|
|
||||||
{
|
|
||||||
'targets': [
|
|
||||||
{
|
|
||||||
'target_name': 'base',
|
|
||||||
'type': 'none',
|
|
||||||
'direct_dependent_settings': {
|
|
||||||
'include_dirs': [
|
|
||||||
'..',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
'conditions': [
|
|
||||||
['OS == "linux"', {
|
|
||||||
'link_settings': {
|
|
||||||
'libraries': [
|
|
||||||
# We need rt for clock_gettime() used in libjingle.
|
|
||||||
'-lrt',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}],
|
|
||||||
['OS == "mac"', {
|
|
||||||
'link_settings': {
|
|
||||||
'libraries': [
|
|
||||||
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
|
|
||||||
'$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
|
|
||||||
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
# This is a dummy gyp file to satisfy libjingle.gyp.
|
|
||||||
{
|
|
||||||
'targets': [
|
|
||||||
{
|
|
||||||
'target_name': 'net',
|
|
||||||
'type': 'none',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
# 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.
|
|
||||||
|
|
||||||
{
|
|
||||||
'includes': [ 'third_party/webrtc/build/common.gypi', ],
|
|
||||||
'variables': {
|
|
||||||
'peerconnection_sample': 'third_party/libjingle/source/talk/examples/peerconnection',
|
|
||||||
},
|
|
||||||
'conditions': [
|
|
||||||
# TODO(wu): Merge the target for different platforms.
|
|
||||||
['OS=="win"', {
|
|
||||||
'targets': [
|
|
||||||
{
|
|
||||||
'target_name': 'peerconnection_client',
|
|
||||||
'type': 'executable',
|
|
||||||
'sources': [
|
|
||||||
'<(peerconnection_sample)/client/conductor.cc',
|
|
||||||
'<(peerconnection_sample)/client/conductor.h',
|
|
||||||
'<(peerconnection_sample)/client/defaults.cc',
|
|
||||||
'<(peerconnection_sample)/client/defaults.h',
|
|
||||||
'<(peerconnection_sample)/client/main.cc',
|
|
||||||
'<(peerconnection_sample)/client/main_wnd.cc',
|
|
||||||
'<(peerconnection_sample)/client/main_wnd.h',
|
|
||||||
'<(peerconnection_sample)/client/peer_connection_client.cc',
|
|
||||||
'<(peerconnection_sample)/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/jsoncpp/jsoncpp.gyp:jsoncpp',
|
|
||||||
'third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
|
|
||||||
],
|
|
||||||
'include_dirs': [
|
|
||||||
'src',
|
|
||||||
'src/modules/interface',
|
|
||||||
'third_party/libjingle/source',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
], # targets
|
|
||||||
}, ], # OS="win"
|
|
||||||
['OS=="linux"', {
|
|
||||||
'targets': [
|
|
||||||
{
|
|
||||||
'target_name': 'peerconnection_client',
|
|
||||||
'type': 'executable',
|
|
||||||
'sources': [
|
|
||||||
'<(peerconnection_sample)/client/conductor.cc',
|
|
||||||
'<(peerconnection_sample)/client/conductor.h',
|
|
||||||
'<(peerconnection_sample)/client/defaults.cc',
|
|
||||||
'<(peerconnection_sample)/client/defaults.h',
|
|
||||||
'<(peerconnection_sample)/client/linux/main.cc',
|
|
||||||
'<(peerconnection_sample)/client/linux/main_wnd.cc',
|
|
||||||
'<(peerconnection_sample)/client/linux/main_wnd.h',
|
|
||||||
'<(peerconnection_sample)/client/peer_connection_client.cc',
|
|
||||||
'<(peerconnection_sample)/client/peer_connection_client.h',
|
|
||||||
],
|
|
||||||
'dependencies': [
|
|
||||||
'third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
|
|
||||||
'third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
|
|
||||||
# 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',
|
|
||||||
],
|
|
||||||
'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',
|
|
||||||
'-lXcomposite',
|
|
||||||
'-lXext',
|
|
||||||
'-lXrender',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
], # 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',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}, ],
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
# 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:*',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
# This file will be picked up by gyp to initialize some global settings.
|
|
||||||
{
|
|
||||||
'variables': {
|
|
||||||
'build_with_chromium': 1,
|
|
||||||
'clang_use_chrome_plugins': 0,
|
|
||||||
'enable_protobuf': 1,
|
|
||||||
'enabled_libjingle_device_manager': 1,
|
|
||||||
'include_internal_audio_device': 1,
|
|
||||||
'include_internal_video_capture': 1,
|
|
||||||
'include_internal_video_render': 1,
|
|
||||||
'include_pulse_audio': 1,
|
|
||||||
'use_openssl': 1,
|
|
||||||
},
|
|
||||||
'target_defaults': {
|
|
||||||
'conditions': [
|
|
||||||
['OS=="linux" and clang==1', {
|
|
||||||
'cflags': [
|
|
||||||
# Suppress the warning caused by
|
|
||||||
# LateBindingSymbolTable::TableInfo from
|
|
||||||
# latebindingsymboltable.cc.def.
|
|
||||||
'-Wno-address-of-array-temporary',
|
|
||||||
],
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
}, # target_defaults
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user