[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-browser-build/master] Bug 25483: Remove depot_tools, go-webrtc, webrtc projects.
commit 52ebafd72bdbbd713d080a5a5828fefd2c6cf0d7
Author: David Fifield <david@xxxxxxxxxxxxxxx>
Date: Thu Aug 29 03:24:50 2019 +0000
Bug 25483: Remove depot_tools, go-webrtc, webrtc projects.
Remove mentions of webrtc and gclient from README.
---
README | 6 +-
projects/depot_tools/build | 8 --
projects/depot_tools/config | 5 -
projects/go-webrtc/config | 63 -----------
projects/webrtc/build | 163 ---------------------------
projects/webrtc/config | 123 ---------------------
projects/webrtc/webrtc-linux.patch | 25 -----
projects/webrtc/webrtc-mac.patch | 220 -------------------------------------
8 files changed, 2 insertions(+), 611 deletions(-)
diff --git a/README b/README
index 6aa763e..2ea5630 100644
--- a/README
+++ b/README
@@ -15,9 +15,7 @@ from containers.
The sources of most components are downloaded using git, which needs to
be installed. Some components are downloaded using mercurial which also
-needs to be installed. The sources of webrtc are downloaded using
-gclient, which requires GTK+ 2.0 development files and curl to be
-installed.
+needs to be installed.
You also need a few perl modules installed:
- YAML::XS
@@ -44,7 +42,7 @@ If you are running Debian or Ubuntu, you can install them with:
libio-captureoutput-perl libjson-perl libpath-tiny-perl \
libstring-shellquote-perl libsort-versions-perl \
libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \
- libfile-copy-recursive-perl git libgtk2.0-dev curl runc \
+ libfile-copy-recursive-perl git runc \
mercurial
The build system is based on rbm, which is included as a git submodule
diff --git a/projects/depot_tools/build b/projects/depot_tools/build
deleted file mode 100644
index ac0f21b..0000000
--- a/projects/depot_tools/build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-tar xf [% project %]-[% c("version") %].tar.gz
-mv [% project %]-[% c("version") %] [% project %]
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/depot_tools/config b/projects/depot_tools/config
deleted file mode 100644
index a1848dc..0000000
--- a/projects/depot_tools/config
+++ /dev/null
@@ -1,5 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1
-git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git
-filename: '[% project %]-[% c("version") %].tar.gz'
diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config
deleted file mode 100644
index fcf6e89..0000000
--- a/projects/go-webrtc/config
+++ /dev/null
@@ -1,63 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
-git_url: https://github.com/keroserene/go-webrtc.git
-git_hash: ed20e74ef428d6149a95bab8e63afb47af55c204
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-build: '[% c("projects/go/var/build_go_lib") %]'
-
-var:
- container:
- use_container: 1
- go_lib: github.com/keroserene/go-webrtc
- build_go_lib_pre: |
- [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
- [% IF c("var/linux") %]
- tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
- export PATH="/var/tmp/dist/binutils/bin:$PATH"
- [% END -%]
- tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/webrtc') %]
- # Replace the prebuilt webrtc library with our own one.
- rm -rf include/ lib/
- cp -a /var/tmp/dist/webrtc/{include,lib} .
- [% IF c("var/linux") -%]
- # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h.
- export CGO_CXXFLAGS="-D__STDC_FORMAT_MACROS=1"
- export CGO_LDFLAGS=-latomic
- [% END -%]
- [% IF c("var/osx") -%]
- export CGO_ENABLED=1
- export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
- export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
- export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=[% c("var/macosx_deployment_target") %]"
- export CC="$clangdir/bin/clang"
- export CXX="$clangdir/bin/clang++"
- [% END -%]
-
-targets:
- linux-i686:
- var:
- arch_deps:
- - pkg-config
- - libx11-dev:i386
- linux-x86_64:
- var:
- arch_deps:
- - pkg-config
- - libx11-dev
- osx-x86_64:
- var:
- arch_deps:
- - pkg-config
-
-input_files:
- - project: container-image
- - name: go
- project: go
- - name: webrtc
- project: webrtc
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - name: binutils
- project: binutils
- enable: '[% c("var/linux") %]'
diff --git a/projects/webrtc/build b/projects/webrtc/build
deleted file mode 100644
index 2ede64b..0000000
--- a/projects/webrtc/build
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-set -e
-[% c("var/set_default_env") -%]
-distdir=/var/tmp/dist/[% project %]
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-
-mkdir -p /var/tmp/dist
-
-[% IF c("var/linux") %]
- tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
- export PATH="/var/tmp/dist/binutils/bin:$PATH"
-[% END -%]
-[% IF c("var/osx") -%]
- # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool".
- ln -sf x86_64-apple-darwin11-libtool $cctoolsdir/libtool
- export AR=x86_64-apple-darwin11-ar
- # Certain cross-compiling flags are set in webrtc-mac.patch because the build
- # system doesn't honor CFLAGS etc. environment variables.
-[% ELSE -%]
- AR=ar
-[% END -%]
-
-# Setting up depot_tools
-# https://dev.chromium.org/developers/how-tos/install-depot-tools
-tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/depot_tools') %]
-export PATH="$PATH:/var/tmp/dist/depot_tools"
-# Disable automatic updating.
-export DEPOT_TOOLS_UPDATE=0
-
-mkdir -p /var/tmp/build
-tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz
-
-builddir=/var/tmp/build/[% project %]/src
-cd $builddir
-
-[% IF c("var/linux") -%]
- patch -p1 < $rootdir/webrtc-linux.patch
-[% END -%]
-[% IF c("var/osx") -%]
- patch -p1 < $rootdir/webrtc-mac.patch
-[% END -%]
-
-[% IF c("var/linux") -%]
- # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64.
- cd tools/gn
- # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h.
- CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean
- cd ../..
- # This is where bootstrap.py stashes the built gn.
- GN="$PWD/out_bootstrap/gn"
-[% END -%]
-[% IF c("var/osx") -%]
- # The linux descriptor builds its own copy of gn, using tools/gn/bootstrap/bootstrap.py.
- # I tried that here, but for some reason the gn so built doesn't work. On "gn gen",
- # it crashes with this error:
- # [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: !rule.empty().
- # Instead, use the gn packaged with depot_tools.
- GN="/var/tmp/dist/depot_tools/gn"
-
- # Hardcode the output of some utility programs that otherwise require Xcode
- # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably
- # needs to be kept in sync with the SDK version.
- cat <<EOF > build/mac/find_sdk.py
-print("$sysrootdir")
-print("10.11")
-EOF
- cat <<EOF > build/config/mac/sdk_info.py
-print("machine_os_build=\"[% c("var/macosx_deployment_target") %]\"")
-print("sdk_build=\"10.11\"")
-print("sdk_path=\"$sysrootdir\"")
-print("sdk_platform_path=\"$sysrootdir\"")
-print("sdk_version=\"10.11\"")
-print("xcode_build=\"7.3\"")
-print("xcode_version=\"0730\"")
-EOF
-[% END -%]
-
-
-[% IF c("var/linux") -%]
- export CC=gcc
- export CXX=g++
-[% END -%]
-[% IF c("var/linux-i686") -%]
- GYP_DEFINES+=" target_arch=ia32"
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export CFLAGS=-m32
- export CXXFLAGS=-m32
- export LDFLAGS=-m32
-[% END -%]
-
-export GN_ARGS=""
-# For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release".
-# https://gn.googlesource.com/gn/+/master/docs/cross_compiles.md
-# Not debug.
-GN_ARGS+=" is_debug=false"
-# There are warnings from unused returns.
-GN_ARGS+=" treat_warnings_as_errors=false"
-# Build static libraries.
-GN_ARGS+=" is_component_build=false"
-# Do not use bundled utilities.
-GN_ARGS+=" is_clang=false use_sysroot=false"
-# Use libstdc++, not libc++.
-GN_ARGS+=" use_custom_libcxx=false"
-[% IF c("var/linux") -%]
- GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\""
- GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\""
- # Make extra sure we don't use bundled binutils.
- rm -rf third_party/binutils/Linux_*
- # Avoid some dependencies.
- GN_ARGS+=" use_ozone=true use_gconf=false"
- GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false"
- # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here?
- #GN_ARGS+=" rtc_include_tests=false"
-[% END -%]
-[% IF c("var/osx") -%]
- GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"[% c("var/macosx_deployment_target") %]\""
- GN_ARGS+=" clang_use_chrome_plugins=false"
- GN_ARGS+=" clang_base_path=\"$clangdir\""
- # No lld in our toolchain currently.
- GN_ARGS+=" use_lld=false"
- # Avoid some dependencies.
- GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false"
- # Tests are needed for field_trial, metrics_default, and pc_test_utils targets
- # (which include code needed by go-webrtc).
- GN_ARGS+=" rtc_include_tests=true"
- # Make sure not to use bundled clang and binutils.
- rm -rf third_party/llvm-build
- rm -rf third_party/binutils
-[% END -%]
-rm -rf out/Release
-"$GN" gen out/Release --args="$GN_ARGS"
-ninja -C out/Release webrtc field_trial metrics_default pc_test_utils
-# The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the
-# ZERO_AR_DATE environment variable similarly sets timestamps within the
-# archive to zero.
-# https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.html
-# https://codereview.chromium.org/699083004/
-# .o files under out/Release/obj/ are the build outputs. Don't include .o
-# files from elsewhere under out/ because they are build helpers and things
-# like that, not necessarily of the target architecture, and anyway are not
-# needed.
-# https://bugs.torproject.org/22832
-find out/Release/obj -name '*.o' -print0 | sort -z \
- | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a
-
-mkdir -p $distdir
-cd $distdir
-mkdir -p include lib
-cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %]
-INCLUDE_DIR="$PWD/include"
-cd $builddir
-find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h;
-do
- mkdir -p "$INCLUDE_DIR/$(dirname "$h")"
- cp -f "$h" "$INCLUDE_DIR/$h"
-done
-
-cd /var/tmp/dist
-[% c('tar', {
- tar_src => [ project ],
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
- }) %]
diff --git a/projects/webrtc/config b/projects/webrtc/config
deleted file mode 100644
index ff2792e..0000000
--- a/projects/webrtc/config
+++ /dev/null
@@ -1,123 +0,0 @@
-# vim: filetype=yaml sw=2
-version: '[% c("var/webrtc_tag") %]'
-filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-
-var:
- container:
- use_container: 1
- webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483
-
-input_files:
- - project: container-image
- - project: webrtc
- pkg_type: fetch_sources
- - project: depot_tools
- name: depot_tools
- - name: '[% c("var/compiler") %]'
- project: '[% c("var/compiler") %]'
- - project: binutils
- name: binutils
- enable: '[% c("var/linux") %]'
- - filename: webrtc-linux.patch
- enable: '[% c("var/linux") %]'
- - filename: webrtc-mac.patch
- enable: '[% c("var/osx") %]'
-
-targets:
- linux:
- var:
- webrtc:
- os: linux
- linux-i686:
- var:
- webrtc:
- lib_path: lib/libwebrtc-linux-386-magic.a
- sort_deps: 0
- arch_deps:
- - lib32asound2-dev
- - lib64expat1
- - libexpat1-dev:i386
- - libglib2.0-dev:i386
- - libgtk-3-dev:i386
- - libudev-dev:i386
- - libx11-dev:i386
- - libxext-dev:i386
- - libxrandr-dev:i386
- - pkg-config
- - hardening-wrapper
- linux-x86_64:
- var:
- webrtc:
- lib_path: lib/libwebrtc-linux-amd64-magic.a
- arch_deps:
- - libasound2-dev
- - libexpat1-dev
- - libglib2.0-dev
- - libgtk-3-dev
- - libudev-dev
- - libx11-dev
- - libxext-dev
- - libxrandr-dev
- - pkg-config
- osx-x86_64:
- var:
- webrtc:
- lib_path: lib/libwebrtc-darwin-amd64-magic.a
- arch_deps:
- - libglib2.0-dev
- - pkg-config
- - python-biplist
-
-steps:
- fetch_sources:
- var:
- container:
- use_container: 0
- filename: 'webrtc-sources-[% c("var/webrtc_tag") %].tar.gz'
- fetch_sources: |
- #!/bin/bash
- [% c("var/set_default_env") -%]
- # WebRTC is special, having its own build system that brings in lots of Chromium dependencies.
- # https://webrtc.org/native-code/development/
- tar xf [% c('input_files_by_name/depot_tools') %]
- export PATH="$rootdir/depot_tools:$PATH"
- # Use --no-history because the whole checkout with history is about 12 GB.
- # JAVA_HOME is needed in a hook for libjingle. The readlink line tries to find the current JRE.
- # default-java comes from the package default-jdk-headless.
- export JAVA_HOME=/usr/lib/jvm/default-java
- clone_dir='[% c("basedir") %]/gclient/webrtc'
- mkdir -p "$clone_dir"
- cd "$clone_dir"
- if [ ! -d "src" ];
- then
- # "fetch" is part of depot_tools.
- #fetch --nohooks --no-history webrtc
- # FIXME: To avoid the unconditional `gclient sync` in the call to fetch,
- # we inline the result of a `fetch --dry-run`
- gclient root
- gclient config --spec 'solutions = [
- {
- "managed": False,
- "name": "src",
- "url": "https://chromium.googlesource.com/external/webrtc.git";,
- "custom_deps": {},
- "deps_file": "DEPS",
- "safesync_url": "",
- },
- ]
- '
- gclient sync --nohooks --no-history --with_branch_heads -r [% c("var/webrtc_tag") %]
- cd src
- git submodule foreach 'git config -f $toplevel/.git/config submodule.$name.ignore all'
- git config --add remote.origin.fetch '+refs/tags/*:refs/tags/*'
- git config diff.ignoreSubmodules all
- cd ..
- fi
- # "gclient" is part of depot_tools. This download takes a long time the first time.
- gclient sync --force --delete_unversioned_trees --reset --no-history --with_branch_heads -r [% c("var/webrtc_tag") %]
- cd ..
- tar --exclude .git -czf [% dest_dir _ '/' _ c('filename') %] webrtc
- input_files:
- - project: depot_tools
- name: depot_tools
- pkg_type: build
diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch
deleted file mode 100644
index efeebbb..0000000
--- a/projects/webrtc/webrtc-linux.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Mon, 3 Dec 2018 21:14:32 -0700
-Subject: [PATCH] Disable some settings in build_overrides.
-
----
- build_overrides/build.gni | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build_overrides/build.gni b/build_overrides/build.gni
-index 81cb3e73ae..5304a64ce8 100644
---- a/build_overrides/build.gni
-+++ b/build_overrides/build.gni
-@@ -10,7 +10,7 @@
- enable_java_templates = true
-
- # Some non-Chromium builds don't use Chromium's third_party/binutils.
--linux_use_bundled_binutils_override = true
-+linux_use_bundled_binutils_override = false
-
- # Variable that can be used to support multiple build scenarios, like having
- # Chromium specific targets in a client project's GN file etc.
---
-2.11.0
-
diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch
deleted file mode 100644
index d1144af..0000000
--- a/projects/webrtc/webrtc-mac.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Mon, 3 Dec 2018 21:03:16 -0700
-Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac.
-
----
- config/BUILDCONFIG.gn | 4 ++--
- toolchain/mac/BUILD.gn | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index 48ed140c7..15e06808c 100644
---- a/build/config/BUILDCONFIG.gn
-+++ b/build/config/BUILDCONFIG.gn
-@@ -238,8 +238,8 @@ if (target_os == "android") {
- } else if (target_os == "ios") {
- _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu"
- } else if (target_os == "mac") {
-- assert(host_os == "mac", "Mac cross-compiles are unsupported.")
-- _default_toolchain = host_toolchain
-+ # assert(host_os == "mac", "Mac cross-compiles are unsupported.")
-+ _default_toolchain = "//build/toolchain/mac:clang_$host_cpu"
- } else if (target_os == "win") {
- # On Windows we use the same toolchain for host and target by default.
- # Beware, win cross builds mostly don't work yet, see docs/win_cross.md
-diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
-index fc113d6a3..7a0171700 100644
---- a/build/toolchain/mac/BUILD.gn
-+++ b/build/toolchain/mac/BUILD.gn
-@@ -14,7 +14,7 @@ if (is_ios) {
- import("//build/config/mac/mac_sdk.gni")
- import("//build/config/mac/symbols.gni")
-
--assert(host_os == "mac")
-+# assert(host_os == "mac")
-
- import("//build/toolchain/cc_wrapper.gni")
- import("//build/toolchain/clang_static_analyzer.gni")
---
-2.11.0
-
-From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Mon, 3 Dec 2018 21:04:26 -0700
-Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn.
-
-The build system doesn't provide a general way to set flags externally.
-"No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS"
-https://bugs.chromium.org/p/chromium/issues/detail?id=595653
----
- config/mac/BUILD.gn | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn
-index 4c681e88c..26fbcac2b 100644
---- a/build/config/mac/BUILD.gn
-+++ b/build/config/mac/BUILD.gn
-@@ -57,6 +57,11 @@ config("runtime_library") {
- "-isysroot",
- rebase_path(sysroot, root_build_dir),
- "-mmacosx-version-min=$mac_deployment_target",
-+ "-target",
-+ "x86_64-apple-darwin11",
-+ "-Wno-unknown-warning-option",
-+ "-B",
-+ "/var/tmp/dist/macosx-toolchain/cctools/bin",
- ]
-
- asmflags = common_flags
---
-2.11.0
-
-From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Tue, 4 Dec 2018 07:37:42 +0000
-Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags.
-
-Not supported in our current version of llvm:
-clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help'
-clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'?
----
- config/compiler/BUILD.gn | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
-index a6ba4ea6..e775f9f5 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -427,10 +427,10 @@ config("compiler") {
- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
- target_os != "chromeos") {
- cflags += [
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-+ # "-Xclang",
-+ # "-mllvm",
-+ # "-Xclang",
-+ # "-instcombine-lower-dbg-declare=0",
- ]
- }
-
---
-2.11.0
-
-From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Mon, 3 Dec 2018 21:06:06 -0700
-Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist.
-
-So as not to require the plutil command. plutil was only being used to
-convert between XML and binary plist formats, because versions of the
-plistlib module before Python 3.4 only support the XML format. The
-biplist library handles both formats natively.
-
-FAILED: gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist
-python ../../build/config/mac/plist_util.py merge -f=xml1 -o=gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist ../../build/config/mac/BuildInfo.plist ../../webrtc/examples/objc/AppRTCMobile/mac/Info.plist
-Traceback (most recent call last):
- File "../../build/config/mac/plist_util.py", line 254, in <module>
- sys.exit(Main())
- File "../../build/config/mac/plist_util.py", line 250, in Main
- args.func(args)
- File "../../build/config/mac/plist_util.py", line 207, in _Execute
- data = MergePList(data, LoadPList(filename))
- File "../../build/config/mac/plist_util.py", line 121, in LoadPList
- subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path])
- File "/usr/lib/python2.7/subprocess.py", line 535, in check_call
- retcode = call(*popenargs, **kwargs)
- File "/usr/lib/python2.7/subprocess.py", line 522, in call
- return Popen(*popenargs, **kwargs).wait()
- File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
- errread, errwrite)
- File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child
- raise child_exception
-OSError: [Errno 2] No such file or directory
----
- config/mac/plist_util.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py
-index bba0208a5..019dcf918 100644
---- a/build/config/mac/plist_util.py
-+++ b/build/config/mac/plist_util.py
-@@ -3,7 +3,7 @@
- # found in the LICENSE file.
-
- import argparse
--import plistlib
-+import biplist
- import os
- import re
- import subprocess
-@@ -89,6 +89,7 @@ def Interpolate(value, substitutions):
-
- def LoadPList(path):
- """Loads Plist at |path| and returns it as a dictionary."""
-+ return biplist.readPlist(path)
- fd, name = tempfile.mkstemp()
- try:
- subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path])
-@@ -100,6 +101,7 @@ def LoadPList(path):
-
- def SavePList(path, format, data):
- """Saves |data| as a Plist to |path| in the specified |format|."""
-+ return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format
- fd, name = tempfile.mkstemp()
- try:
- # "plutil" does not replace the destination file but update it in place,
---
-2.11.0
-
-From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Tue, 4 Dec 2018 05:16:04 +0000
-Subject: [PATCH 5/6] Override use_system_xcode=true.
-
----
- build_overrides/build.gni | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/build_overrides/build.gni b/build_overrides/build.gni
-index 81cb3e73ae..b683ea850c 100644
---- a/build_overrides/build.gni
-+++ b/build_overrides/build.gni
-@@ -46,3 +46,5 @@ if (host_os == "mac") {
- "hermetic toolchain if the minimum OS version is not met.")
- use_system_xcode = _result == 0
- }
-+
-+use_system_xcode = true
---
-2.11.0
-
-From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001
-From: David Fifield <david@xxxxxxxxxxxxxxx>
-Date: Mon, 3 Dec 2018 21:11:14 -0700
-Subject: [PATCH 6/6] Disable the desktop_capture module.
-
-It's causing an error related to CoreGraphics.h and hopefully we don't
-need it.
----
- modules/BUILD.gn | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/modules/BUILD.gn b/modules/BUILD.gn
-index 465f32d3c4..578cdbd57e 100644
---- a/modules/BUILD.gn
-+++ b/modules/BUILD.gn
-@@ -17,7 +17,6 @@ group("modules") {
- "audio_processing",
- "bitrate_controller",
- "congestion_controller",
-- "desktop_capture",
- "media_file",
- "pacing",
- "remote_bitrate_estimator",
---
-2.11.0
-
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits