zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move build scripts to webrtc/build/ios

Browse Source 
BUG=
NOTRY=True

Review URL: https://codereview.webrtc.org/1801943003

Cr-Commit-Position: refs/heads/master@{#12079}
This commit is contained in:
hjon
2016-03-21 11:38:26 -07:00
committed by Commit bot
parent 0db3db94e5
commit bc73fe1aad
13 changed files with 102 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
talk/app/webrtc/legacy_objc_api_tests.gyp
View File

@ -35,7 +35,7 @@
{
'target_name': 'libjingle_peerconnection_objc_test',
'type': 'executable',
'includes': [ '../../build/objc_app.gypi' ],
'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ],
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
@ -67,7 +67,7 @@
{
'target_name': 'apprtc_signaling_gunit_test',
'type': 'executable',
'includes': [ '../../build/objc_app.gypi' ],
'includes': [ '../../../webrtc/build/ios/objc_app.gypi' ],
'dependencies': [
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',

5
talk/build/OWNERS
View File

@ -1,5 +0,0 @@
# These are for the common case of adding or renaming files. If you're doing
# structural changes, please get a review from a reviewer in this file.
per-file *.gyp=*
per-file *.gypi=*

53
talk/build/merge_ios_libs.gyp
View File

@ -1,53 +0,0 @@
#
# libjingle
# Copyright 2015 Google Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
'includes': ['common.gypi',],
'conditions': [
['OS=="ios" or OS=="mac"', {
'targets': [
{
'target_name': 'libjingle_peerconnection_objc_no_op',
'includes': [ 'objc_app.gypi' ],
'type': 'executable',
'dependencies': [
'../app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc',
],
'sources': ['<(webrtc_root)/build/no_op.cc',],
},
{
'target_name': 'webrtc_api_objc_no_op',
'includes': [ 'objc_app.gypi' ],
'type': 'executable',
'dependencies': [
'<(webrtc_root)/api/api.gyp:rtc_api_objc',
],
'sources': ['<(webrtc_root)/build/no_op.cc',],
},
],
}]
],
}

51
talk/build/objc_app.gypi
View File

@ -1,51 +0,0 @@
#
# libjingle
# Copyright 2014 Google Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Include this .gypi in an ObjC target's definition to allow it to be
# used as an iOS or OS/X application.
{
'variables': {
'infoplist_file': './objc_app.plist',
},
'dependencies': [
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
],
'mac_bundle': 1,
'mac_bundle_resources': [
'<(infoplist_file)',
],
# The plist is listed above so that it appears in XCode's file list,
# but we don't actually want to bundle it.
'mac_bundle_resources!': [
'<(infoplist_file)',
],
'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES',
'INFOPLIST_FILE': '<(infoplist_file)',
},
}

5
talk/build/whitespace.txt
View File

@ -1,5 +0,0 @@
You can modify this file to create no-op changelists.
Try to write something funny. And please don't add trailing whitespace.
Once upon a time there were three whitespaces.

1
webrtc/build/ios/OWNERS
View File

@ -1 +1,2 @@
kjellander@webrtc.org
tkchin@webrtc.org

37
talk/build/build_ios_libs.sh → webrtc/build/ios/build_ios_libs.sh
View File

@ -1,34 +1,17 @@
#!/bin/bash
# Copyright 2015 The WebRTC project authors. All Rights Reserved.
#
# libjingle
# Copyright 2015 Google Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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.
# Generates static FAT libraries for ios in out_ios_libs.
# Flag to build the new or legacy version of the API.
USE_LEGACY_API=1
USE_LEGACY_API=0
# Check for Darwin.
if [[ ! $(uname) = "Darwin" ]]; then
@ -42,7 +25,7 @@ fi
# Check for GYP generator.
SCRIPT_DIR=$(dirname $0)
WEBRTC_BASE_DIR=${SCRIPT_DIR}/../..
WEBRTC_BASE_DIR=${SCRIPT_DIR}/../../..
GYP_WEBRTC_SCRIPT=${WEBRTC_BASE_DIR}/webrtc/build/gyp_webrtc
if [[ ! -x ${GYP_WEBRTC_SCRIPT} ]]; then
echo "Failed to find gyp generator." >&2
@ -77,7 +60,7 @@ function build_webrtc {
clang_xcode=1"
export GYP_GENERATORS="ninja"
export GYP_GENERATOR_FLAGS="output_dir=${OUTPUT_DIR}"
webrtc/build/gyp_webrtc talk/build/merge_ios_libs.gyp
webrtc/build/gyp_webrtc webrtc/build/ios/merge_ios_libs.gyp
if [[ ${USE_LEGACY_API} -eq 1 ]]; then
ninja -C ${OUTPUT_DIR}/${FLAVOR} libjingle_peerconnection_objc_no_op
else

2
talk/build/export_headers → webrtc/build/ios/export_headers
View File

@ -41,7 +41,7 @@ def ExportHeaders(include_base_dir, use_legacy_headers):
include_path = os.path.join(include_base_dir, include_dir_name)
script_path = sys.path[0]
webrtc_base_path = os.path.join(script_path, '../..')
webrtc_base_path = os.path.join(script_path, '../../..')
header_dirs = HEADER_DIRS
include_headers = HEADER_INCLUDES

31
talk/build/merge_ios_libs → webrtc/build/ios/merge_ios_libs
View File

@ -1,29 +1,12 @@
#!/usr/bin/python
# Copyright 2016 The WebRTC project authors. All Rights Reserved.
#
# libjingle
# Copyright 2015 Google Inc.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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.
"""Script for merging generated iOS libraries."""

35
webrtc/build/ios/merge_ios_libs.gyp Normal file
View File

@ -0,0 +1,35 @@
# Copyright (c) 2015 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': ['../common.gypi',],
'conditions': [
['OS=="ios" or OS=="mac"', {
'targets': [
{
'target_name': 'libjingle_peerconnection_objc_no_op',
'includes': [ 'objc_app.gypi' ],
'type': 'executable',
'dependencies': [
'../../../talk/app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc',
],
'sources': ['no_op.cc',],
},
{
'target_name': 'webrtc_api_objc_no_op',
'includes': [ 'objc_app.gypi' ],
'type': 'executable',
'dependencies': [
'<(webrtc_root)/api/api.gyp:rtc_api_objc',
],
'sources': ['no_op.cc',],
},
],
}]
],
}

14
webrtc/build/ios/no_op.cc Normal file
View File

@ -0,0 +1,14 @@
/*
* 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.
*/
// No-op main() to provide a dummy executable target.
int main() {
return 0;
}

32
webrtc/build/ios/objc_app.gypi Normal file
View File

@ -0,0 +1,32 @@
# 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.
# Include this .gypi in an ObjC target's definition to allow it to be
# used as an iOS or OS/X application.
{
'variables': {
'infoplist_file': './objc_app.plist',
},
'dependencies': [
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
],
'mac_bundle': 1,
'mac_bundle_resources': [
'<(infoplist_file)',
],
# The plist is listed above so that it appears in XCode's file list,
# but we don't actually want to bundle it.
'mac_bundle_resources!': [
'<(infoplist_file)',
],
'xcode_settings': {
'CLANG_ENABLE_OBJC_ARC': 'YES',
'INFOPLIST_FILE': '<(infoplist_file)',
},
}

0
talk/build/objc_app.plist → webrtc/build/ios/objc_app.plist
View File